Refactoring, using const, removing global variables, passing some new arguments.

[treecutter.git] / treecutter / page.py

diff --git a/treecutter/page.py b/treecutter/page.py
index 1bd6cd7002d871ad503eec22e1c518e52c00d8ab..ce1296026d63b963c1297f01582a657359f00e25 100644 (file)
--- a/treecutter/page.py
+++ b/treecutter/page.py
@@ -33,7 +33,7 @@ class Page():
         self._rendered_article = art
 
     def prepare(self):
-        self._doc = bindery.parse(self._file, prefixes=PREFIXES)
+        self._doc = bindery.parse(self._file, prefixes=const.PREFIXES)
         if self._doc.xml_select(u'/db:article/db:info/db:title'):
             self._title = unicode(self._doc.article.info.title)
         if self._doc.xml_select(u'/db:article/db:info/db:titleabbrev'):
@@ -44,7 +44,7 @@ class Page():
         if code:
             for c in code:
                 (p, ext) = os.path.splitext(c.href)
-                if ext in valid_scripts:
+                if ext in const.valid_scripts:
                     exe = []
                     exe.append(os.path.join(os.path.abspath(dirname)+'/'+c.href))
                     if c.xml_select(u"//xi:include[@accept-language]"):
@@ -73,7 +73,7 @@ class Page():
             if os.path.isfile(im):
                 self._resources.append(im)
 
-    def render(self):
+    def render(self, style):
         #  amara can not handle the docbook stylesheets
         #  xmlarticle = transform(doc,style_xslt)
         cwd = os.getcwd()
@@ -85,7 +85,7 @@ class Page():
         tfi.write(self._doc.xml_encode(omit_xml_declaration=True))
         tfi.close()
 #  cmd = ["saxon-xslt-xinclude","-o",outfile,infile,style_xslt]
-        cmd = ["xsltproc","--xinclude","--output",outfile,style_xslt,infile]
+        cmd = ["xsltproc","--xinclude","--output",outfile,style+"docbook.xsl",infile]
         retcode = subprocess.call(cmd)
         if retcode:
             print 'Error: '+' '.join(cmd)+' Returncode ['+str(retcode)+']'
@@ -96,17 +96,17 @@ class Page():
         os.remove(outfile)
         os.chdir(cwd)
 
-    def template(self,sitemap):
+    def template(self,sitemap,style,tdir):
         htmlmenu =  sitemap.gen_menu(self._lang,None,"menu")
         levelmenu = sitemap.gen_menu(self._lang,self,"tree")
         langmenu = sitemap.lang_menu(self._lang,self._link)
-        template = Template(file=args.style+'index.'+self._lang+'.html.tmpl',
+        template = Template(file=style+'index.'+self._lang+'.html.tmpl',
                             searchList=[{'title':self._title},
                                         {'menu':htmlmenu},
                                         {'article':self._rendered_article},
                                         {'levelmenu':levelmenu},
                                         {'langmenu':langmenu}])
-        outfile = tmptarget+'html'.join(self._file.rsplit('xml',1))
+        outfile = tdir+'html'.join(self._file.rsplit('xml',1))
         mkdir_p(os.path.dirname(outfile))
         out = open(outfile, 'w')
         out.write(str(template))