[z3-checkins] r33919 - z3/deliverance/branches/packaged/deliverance

[ltucker at codespeak.net]

Author: ltucker
Date: Mon Oct 30 18:24:19 2006
New Revision: 33919

Modified:
   z3/deliverance/branches/packaged/deliverance/handtransform.py
Log:
update handtransformer to xinclude changes and changes to renderer init signature

Modified: z3/deliverance/branches/packaged/deliverance/handtransform.py
==============================================================================
--- z3/deliverance/branches/packaged/deliverance/handtransform.py	(original)
+++ z3/deliverance/branches/packaged/deliverance/handtransform.py	Mon Oct 30 18:24:19 2006
@@ -37,8 +37,6 @@
     content = etree.HTML(grab_url(content_url))
     
     def reference_resolver(href, parse, encoding=None):
-        if not href.startswith('/'):
-            href = os.path.join(os.path.dirname(rules_url),href)
         text = grab_url(href)
         if parse == "xml":
             return etree.XML(text)
@@ -47,9 +45,9 @@
 
     renderer = None
     if renderer_type == 'xslt':
-        renderer = XSLTRenderer(theme,base_url,rules,reference_resolver)
+        renderer = XSLTRenderer(theme,base_url,rules,rules_url,reference_resolver)
     elif renderer_type == 'py':
-        renderer = PythonRenderer(theme,base_url,rules,reference_resolver)
+        renderer = PythonRenderer(theme,base_url,rules,rules_url,reference_resolver)
     else:
         print "Unknown renderer type '" + renderer_type + "'"
         return etree.Element("error")