page: using lxml transform, simple docbook & image

[treecutter.git] / treecutter / sitemap.py

diff --git a/treecutter/sitemap.py b/treecutter/sitemap.py
index 0ecefe4278efae22c581d702bb7c513630e43700..11e300eda9fbc0ff0d8ac6c4e718dfdb27e576dc 100644 (file)
--- a/treecutter/sitemap.py
+++ b/treecutter/sitemap.py
@@ -3,6 +3,7 @@ import os
 import codecs
 import re
 import shutil
+import sys
 import gettext
 import tempfile
 from lxml import etree
@@ -31,7 +32,7 @@ class Sitemap():
     # representing the text on the site.
     # A link can have several pages in different languages.
     def add_link(self, link):
-        tokens = filter(None,re.split(r'(^/[\w:-]*$|^/[\w:-]*/|[\w:-]*/)',link,flags=re.UNICODE))
+        tokens = filter(None,re.split(r'(^/[\w\.:-]*$|^/[\w\.:-]*/|[\w\.:-]*/)',link,flags=re.UNICODE))
         self._tree.add(tokens,Link(link))
 
     def write_map(self):
@@ -72,12 +73,14 @@ class Sitemap():
                                                            languages=[tran])
         t3 = time()
         print "Language [%5.2f s]" % (round(t3-t2,2))
+        transform = {}
+        transform['xhtml5'] = etree.XSLT(etree.parse(self._style+"docbook.xhtml5.xsl"))
         for link in self._tree:
-            link.render(self._style)
+            link.render(transform)
         t4 = time()
         print "Render   [%5.2f s]" % (round(t4-t3,2))
         for link in self._tree:
-            link.template(self, self._style, self._tmptarget)
+            link.template(self, self._style, self._tmptarget,self._subdir)
         t5 = time()
         print "Template [%5.2f s]" % (round(t5-t4,2))
         t6 = time()
@@ -97,7 +100,7 @@ class Sitemap():
             sitmaplink.add_page((l,'/sitemap.'+l+'.xml'))
         for l in self._sitelang:
             sitmaplink.page(l).set_article(self.gen_menu(l,None,"tree sitemap"))
-            sitmaplink.page(l).template(self,self._style,self._tmptarget)
+            sitmaplink.page(l).template(self,self._style,self._tmptarget,self._subdir)
         t7 = time()
         print "Sitemap  [%5.2f s]" % (round(t7-t6,2))
 
@@ -127,7 +130,7 @@ class Sitemap():
     def publish(self):
         ssh_cmd(self._output,"mkdir -p")
         publish(self._tmptarget, self._output)
-        for res in ["css","images","js","fonts","favicon.ico"]:
+        for res in ["stylesheets","images","js","fonts","favicon.ico"]:
             if (os.path.exists(self._style+res)):
                 publish(self._style+res, self._output)
         ssh_cmd(self._output,"chmod a+rx")