Fixing sitemap generation, language menus and resource copying.

diff --git a/src/tree-cutter.py b/src/tree-cutter.py
index 519acc9e21e98120aed3807b2507cdab829a154d..ab3fb5d13c48c3ddf4aeef29fbaa32189cb6376a 100755 (executable)
--- a/src/tree-cutter.py
+++ b/src/tree-cutter.py
@@ -75,7 +75,8 @@ class Directory():
 
 class Page():
     """Class representing a version of a webpage"""
-    def __init__(self,page):
+    def __init__(self,link,page):
+        self._link = link
         self._file = page[1]
         self._lang = page[0]
         self._doc = None
@@ -87,6 +88,9 @@ class Page():
     def language(self):
         return self._lang
 
+    def resources(self):
+        return set(self._resources)
+
     def menu(self):
         return self._menu
 
@@ -149,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")
-        langmenu = sitemap.lang_menu(self._lang)
         template = Template(file=style_tmpl,
+        langmenu = sitemap.lang_menu(self._lang,self._link)
                             searchList=[{'title':self._title},
                                         {'menu':htmlmenu},
                                         {'article':self._rendered_article},
@@ -174,7 +178,10 @@ class Link():
             path = path+'index'
         lang = self._scan_languages(path)
         for l in lang:
-            self._pages.append(Page(l))
+            self._pages.append(Page(self,l))
+
+    def add_page(self,l):
+        self._pages.append(Page(self,l))
 
     def _scan_languages(self,path):
         lang = []
@@ -209,6 +216,14 @@ class Link():
         for page in self._pages:
             if page.language()==lang:
                 return page
+        return None
+
+    def resources(self):
+        res  = set()
+        for page in self._pages:
+            res = res.union(page.resources())
+        return res
+
 
 class Node():
     def __init__(self,token,value):
@@ -273,11 +288,17 @@ class Trie():
         html = "<ul%s>\n" % css
         for l in trie:
             sel = ''
-            if l.value().page(lang) == page:
+            p = l.value().page(lang)
+            if p == page:
                 sel = ' class="selected"'
-            html += '<li%s><a href="%s">%s</a>\n' \
-            % (sel,l.value().link(),l.value().page(lang).menu())
-            html += self._menu(l.children(), lang, page, "")
+            if p != None:
+                html += '<li%s><a href="%s">%s</a>\n' \
+                    % (sel,l.value().link(),p.menu())
+            else:
+                html += '<li%s><a href="%s.en" hreflang="en">%s</a>*\n' \
+                    % (sel,l.value().link(), l.value().page('en').menu())
+            if l.children():
+                html += self._menu(l.children(), lang, page, "")
         html += "</ul>\n"
         return html
 
@@ -339,13 +360,24 @@ class Sitemap():
             link.template(self)
         t5 = time.time()
         print "Template [%5.2f s]" % (round(t5-t4,2))
-        sm = {}
-        for l in self._sitelang:
-            sm[l] = Page((l,'/sitemap'))
-            sm[l].set_article(self.gen_menu(l,None,"tree sitemap"))
-            sm[l].template(self)
         t6 = time.time()
-        print "Sitemap  [%5.2f s]" % (round(t6-t5,2))
+        res = set()
+        cwd = os.getcwd()
+        for link in self._tree:
+            res = res.union(link.resources())
+        for f in res:
+            outfile = tmptarget+f
+            mkdir_p(os.path.dirname(outfile))
+            shutil.copyfile(f,outfile)
+        print "Resources[%5.2f s]" % (round(t6-t5,2))
+        sitmaplink = Link('/sitemap')
+        for l in self._sitelang:
+            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)
+        t7 = time.time()
+        print "Sitemap  [%5.2f s]" % (round(t7-t6,2))
 
     def graph(self):
         self._tree.graph()
@@ -353,14 +385,18 @@ class Sitemap():
     def gen_menu(self,lang,page,cssclass):
         return self._tree.menu(lang,page,cssclass)
 
-    def lang_menu(self,lang):
+    def lang_menu(self,lang,link):
         html = "<ul>"
-        for l in self._sitelang:
+        for l in link.languages():
             isoxml = u"//iso_639_3_entry[@*='"+l+"']"
             ln = self._isocode.xml_select(isoxml)[0].name
             if lang != 'en':
                 ln = self._tranlang[lang].gettext(ln)
-            html += '<li><a href="%s">%s</a></li>' % ('link'+'.'+l, ln)
+            p = link.link()
+            if p[-1] == '/':
+                p = p +'index'
+            p = p+'.'+l
+            html += '<li><a href="%s" hreflang="%s">%s</a></li>' % (p, l, ln)
         html += "</ul>"
         return html