Changeset 96:ef1f4bb715a6

Timestamp:

01/21/09 10:14:25 (14 months ago)

Author:

Ga?tan de Menten <ged@…>

Branch:

default

Message:

copy iterable in case of a rowspan'ed column repetition, so that we don't end
up with empty columns if the data is provided by a generator.

Files:

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

relatorio/templates/opendocument.py

@@ -372 +372 @@
                     if table_rowspan_attr in o_node_attrs:
                         rows_spanned = int(o_node_attrs[table_rowspan_attr])
+
+                        # a_val == "target in iterable"
+                        target, iterable = a_val.split(' in ', 1)
+                        temp_var = "temp%d" % id(outermost_o_ancestor)
+                        # I need to get "temp_iterable = list(iterable)"
+                        vars = "%s = list(%s)" % (temp_var, iterable.strip())
+                        # transform a_val to "target in temp_iterable"
+                        a_val = "%s in %s" % (target, temp_var)
+
+                        with_node = EtreeElement('{%s}with' % py_namespace,
+                                                 attrib={"vars": vars},
+                                                 nsmap=self.namespaces)
+
                         # if so, we need to replace the corresponding cell on
                         # the next line (a covered-table-cell) by a duplicate
@@ -378 +391 @@
                         # them into the py:for node
                         row_node = outermost_o_ancestor.getparent()
+                        row_node.addprevious(with_node)
+                        rows_to_wrap = [row_node]
+
                         assert row_node.tag == table_row_tag
                         next_rows = row_node.itersiblings(table_row_tag)
                         for row_idx in range(rows_spanned-1):
                             next_row_node = next_rows.next()
+                            rows_to_wrap.append(next_row_node)
                             first = next_row_node[opening_pos]
                             last = next_row_node[closing_pos]
@@ -394 +411 @@
                                                     nsmap=self.namespaces)
                             wrap_nodes_between(first, last, for_node)
+
+                        for node in rows_to_wrap:
+                            with_node.append(node)
 
                     # check if this table's headers were already processed