Using translated cheetah templates, allowing - in filenames.

diff --git a/src/tree-cutter.py b/src/tree-cutter.py
index 830bf547570a31abf55604fe99e72f7e951de0c9..bc4ae7e0db92400f8f33019e7d0f09e33d0b1a19 100755 (executable)
--- a/src/tree-cutter.py
+++ b/src/tree-cutter.py
@@ -25,7 +25,6 @@ parser.add_argument('--output', nargs='?',
 args = parser.parse_args()
 
 style_xslt = args.style+"docbook.xsl"
-style_tmpl = args.style+"index.en.html.tmpl"
 outputdir = args.output
 
 tmptarget = tempfile.mkdtemp()+'/'
@@ -154,8 +153,8 @@ class Page():
     def template(self,sitemap):
         htmlmenu =  sitemap.gen_menu(self._lang,None,"menu")
         levelmenu = sitemap.gen_menu(self._lang,self,"tree")
-        template = Template(file=style_tmpl,
         langmenu = sitemap.lang_menu(self._lang,self._link)
+        template = Template(file=args.style+'index.'+self._lang+'.html.tmpl',
                             searchList=[{'title':self._title},
                                         {'menu':htmlmenu},
                                         {'article':self._rendered_article},
@@ -319,7 +318,7 @@ class Sitemap():
         self._tranlang = {}
 
     def add_link(self, link):
-        tokens = filter(None,re.split(r'(^/\w*/|\w*/)',link))
+        tokens = filter(None,re.split(r'(^/[\w-]*/|[\w-]*/)',link))
         self._tree.add(tokens,Link(link))
 
     def write_map(self):
@@ -350,7 +349,8 @@ class Sitemap():
             self._sitelang = self._sitelang.union(set(link.languages()))
         for tran in self._sitelang:
             if tran != 'en':
-                self._tranlang[tran] = gettext.translation('iso_639_3', languages=[tran])
+                self._tranlang[tran] = gettext.translation('iso_639_3',
+                                                           languages=[tran])
         t3 = time.time()
         print "Language [%5.2f s]" % (round(t3-t2,2))
         for link in self._tree:
@@ -601,7 +601,7 @@ for page in removed:
 for page in missing:
     print 'adding missing page '+page
     sitemap.add_link(page)
-if len(missing & removed) != 0:
+if len(missing)+len(removed) != 0:
     print 'writing new sitemap - please adjust if needed'
     sitemap.write_map()
 sitemap.graph()