Changeset 59:7dcb4b335b38

Timestamp:

08/21/08 02:08:56 (19 months ago)

Author:

Nicolas ?vrard <nicoe@…>

Parents:

53:b5e24837a3ba (diff), 58:1180376ab3cf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Branch:

default

Message:

Automated merge with file:///home/nicoe/projets/relatorio/openhex-branch

Files:

• examples/demo.py (deleted)
• relatorio/templates/opendocument.py (modified) (3 diffs)
• relatorio/templates/opendocument.py (modified) (1 diff)

relatorio/templates/opendocument.py

@@ -35 +35 @@
 import genshi.output
 from genshi.template import MarkupTemplate
+from relatorio.reporting import Report
 
 GENSHI_EXPR = re.compile(r'''((/)?(for|choose|otherwise|when|if|with)\s*(\s(\w+)=["'](.*)["']|$)|.*)''')
@@ -55 +56 @@
 class ImageHref:
     
-    def __init__(self, zipfile):
+    def __init__(self, zipfile, context):
         self.zip = zipfile
+        self.context = context.copy()
+        self.obj = self.context.pop('o')
 
     def __call__(self, expr, name):
         bitstream, mimetype = expr
+        if isinstance(bitstream, Report):
+            bitstream = bitstream(self.obj, **self.context).render()
         bitstream.seek(0)
         file_content = bitstream.read()
@@ -275 +280 @@
     def generate(self, *args, **kwargs):
         serializer = OOSerializer(self.filepath)
-        kwargs['make_href'] = ImageHref(serializer.outzip)
+        kwargs['make_href'] = ImageHref(serializer.outzip, kwargs)
         generate_all = super(Template, self).generate(*args, **kwargs)
 

relatorio/templates/opendocument.py

@@ -37 +37 @@
 from relatorio.reporting import Report
 
-GENSHI_EXPR = re.compile(r'''((/)?(for|choose|otherwise|when|if|with)( (\w+)=["'](.*)["']|)|.*)''')
+GENSHI_EXPR = re.compile(r'''((/)?(for|choose|otherwise|when|if|with)\s*(\s(\w+)=["'](.*)["']|$)|.*)''')
 EXTENSIONS = {'image/png': 'png',
               'image/jpeg': 'jpg',