Changeset 159:6e130c152965

Timestamp:

01/21/10 04:22:17 (6 months ago)

Author:

C?dric Krier <ced@…>

Branch:

default

Message:

Update py:attrs attributes in opendocument

Files:

• CHANGES (modified) (1 diff)
• relatorio/templates/opendocument.py (modified) (4 diffs)

CHANGES

@@ +1 @@
+ * Update py:attrs attributes in opendocument
+
 0.5.3 - 20100110
  * Escape elements values in opendocument template

relatorio/templates/opendocument.py

@@ -186 +186 @@
 
 
+def update_py_attrs(node, value):
+    """An helper function to update py_attrs of a node.
+    """
+    if not value:
+        return
+    py_attrs_attr = '{%s}attrs' % GENSHI_URI
+    if not py_attrs_attr in node.attrib:
+        node.attrib[py_attrs_attr] = value
+    else:
+        node.attrib[py_attrs_attr] = \
+                "(lambda x, y: x.update(y) or x)(%s or {}, %s or {})" % \
+                (node.attrib[py_attrs_attr], value)
+
+
 class Template(MarkupTemplate):
 
@@ -417 +431 @@
                 # correct value and type for this cell.
                 dico = "{'%s': %s, '%s': __relatorio_guess_type(%s)}"
-                parent.attrib[py_attrs_attr] = dico % (office_name, expr,
-                                                       office_valuetype, expr)
+                update_py_attrs(parent, dico %
+                        (office_name, expr, office_valuetype, expr))
                 parent.attrib.pop(office_valuetype, None)
                 parent.attrib.pop(office_name, None)
@@ -448 +462 @@
         # operations, but a unique id within the table is required
         # to support nested column repetition
-        ancestor.attrib[py_attrs_attr] = \
-            "__relatorio_reset_col_count(%d)" % loop_id
+        update_py_attrs(ancestor, "__relatorio_reset_col_count(%d)" % loop_id)
 
         # 2) add increment code (through a py:attrs attribute) on
@@ -456 +469 @@
         enclosed_cell = outer_o_node.getnext()
         assert enclosed_cell.tag == '{%s}table-cell' % table_namespace
-        enclosed_cell.attrib[py_attrs_attr] = \
-            "__relatorio_inc_col_count(%d)" % loop_id
+        update_py_attrs(enclosed_cell, "__relatorio_inc_col_count(%d)" %
+                loop_id)
 
         # 3) add "store count" code as a py:replace node, as the