Changeset 84:54b0d747e492

Timestamp:

11/20/08 01:17:19 (16 months ago)

Author:

Nicolas ?vrard <nicoe@…>

Branch:

default

Message:

Support chart templates in ImageHref?

Files:

• relatorio/templates/opendocument.py (modified) (3 diffs)

relatorio/templates/opendocument.py

@@ -37 +37 @@
 from relatorio.templates.base import RelatorioStream
 from relatorio.reporting import Report, MIMETemplateLoader
+try:
+    from relatorio.templates.chart import Template as ChartTemplate
+except ImportError:
+    ChartTemplate = type(None)
 
 GENSHI_EXPR = re.compile(r'''((/)?(for|choose|otherwise|when|if|with)\s*(\s(\w+)=["'](.*)["']|$)|.*)''')
@@ -71 +75 @@
         if isinstance(bitstream, Report):
             bitstream = bitstream(**self.context).render()
+        elif isinstance(bitstream, ChartTemplate):
+            bitstream = bitstream.generate(**self.context).render()
         bitstream.seek(0)
         file_content = bitstream.read()
@@ -270 +276 @@
                 dico = "{'%s': %s, '%s': guess_type(%s)}"
                 parent.attrib[attrib_name] = dico % (office_name, expr,
-                                                     office_valuetype,
-                                                     expr)
+                                                     office_valuetype, expr)
                 parent.attrib.pop(office_valuetype, None)
                 parent.attrib.pop(office_name, None)