Changeset 82:6fe4b0e529b9

Timestamp:

11/19/08 09:07:39 (16 months ago)

Author:

Nicolas ?vrard <nicoe@…>

Branch:

default

Message:

Correctly handle type in table cells

Files:

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

relatorio/templates/opendocument.py

@@ -50 +50 @@
 EtreeElement = lxml.etree.Element
 
+def guess_type(val):
+    if isinstance(val, (str, unicode)):
+        return 'string'
+    elif isinstance(val, (int, float)):
+        return 'float'
 
 class OOTemplateError(genshi.template.base.TemplateSyntaxError):
@@ -260 +265 @@
                 if parent is None or parent.tag != table_cell_tag:
                     continue
-                if parent.attrib.get(office_valuetype, 'string') != 'string':
-                    # The grand-parent tag is a table cell we set the
-                    # office:value attribute of this cell
-                    dico = "{'%s': %s}" % (office_name, expr)
-                    parent.attrib[attrib_name] = dico
-                    parent.attrib.pop(office_name, None)
+
+                # The grand-parent tag is a table cell we should set the
+                # correct value and type for this cell.
+                dico = "{'%s': %s, '%s': guess_type(%s)}"
+                parent.attrib[attrib_name] = dico % (office_name, expr,
+                                                     office_valuetype,
+                                                     expr)
+                parent.attrib.pop(office_valuetype, None)
+                parent.attrib.pop(office_name, None)
 
     def _handle_images(self, tree):
@@ -293 +301 @@
         serializer = OOSerializer(self.filepath)
         kwargs['make_href'] = ImageHref(serializer.outzip, kwargs)
+        kwargs['guess_type'] = guess_type
         generate_all = super(Template, self).generate(*args, **kwargs)