size: printing size of style

[treecutter.git] / treecutter / link.py

diff --git a/treecutter/link.py b/treecutter/link.py
index 69ee9b1cfcd58e951c8b35aecbb7fbcf3deacebb..a62e4d6064bbb8f3aadbeb2fbd661de86687e132 100644 (file)
--- a/treecutter/link.py
+++ b/treecutter/link.py
@@ -1,4 +1,5 @@
 #!/usr/bin/python
+import re
 import glob
 from treecutter.page import Page
 
@@ -8,6 +9,7 @@ class Link():
         self._link = link
         # find the representations of the link.
         self._pages = []
+        self._langregexp = re.compile('.*\.(\w\w)\.xml')
         path = link
         if self._link[-1] == '/':
             path = path+'index'
@@ -20,10 +22,9 @@ class Link():
 
     def _scan_languages(self,path):
         lang = []
-        for l in  glob.glob('.'+path+'*'):
-            ls = l.split('.')
-            if len(ls) > 3 and ls[3] == 'xml':
-                lang.append((ls[2],l))
+        for l in  glob.glob('.'+path+'*.xml'):
+            langcode = self._langregexp.search(l).group(1)
+            lang.append((langcode,l))
         return lang
 
     def link(self):
@@ -39,13 +40,13 @@ class Link():
             p.append(page.language())
         return p
 
-    def render(self, style):
+    def render(self, transform):
         for page in self._pages:
-            page.render(style)
+            page.render(transform)
 
-    def template(self,sitemap,style,tdir):
+    def template(self,sitemap,style,tdir,subdir):
         for page in self._pages:
-            page.template(sitemap,style,tdir)
+            page.template(sitemap,style,tdir,subdir)
 
     def page(self,lang):
         for page in self._pages: