Changeset 46:601bde16384c for relatorio/templates/opendocument.py

Timestamp:

08/08/08 16:05:30 (5 years ago)

Author:

Nicolas ?vrard <nicoe@…>

Children:

47:2cd126dda783, 51:3f7a7a668995

Branch:

default

Message:

Support for both text:a and text:placeholder tags in the opendocument plugin

Fixed tests that relied on the order of the PI in test_odt

Raise an error when the expression to evaluate is empty

Files:

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

relatorio/templates/opendocument.py

@@ -36 +36 @@
 from genshi.template import MarkupTemplate
 
-GENSHI_TAGS = re.compile(r'''relatorio://((/)?(for|choose|otherwise|when|if|with)( (\w+)=["'](.*)["']|)|.*)''')
+GENSHI_EXPR = re.compile(r'''((/)?(for|choose|otherwise|when|if|with)( (\w+)=["'](.*)["']|)|.*)''')
 EXTENSIONS = {'image/png': 'png',
               'image/jpeg': 'jpg',
@@ -47 +47 @@
 _encode = genshi.output.encode
 ETElement = lxml.etree.Element
+
+
+class OOTemplateError(genshi.template.base.TemplateSyntaxError):
+    pass
 
 
@@ -112 +116 @@
 
         self._invert_style(tree)
-        self._handle_text_a(tree)
+        self._handle_relatorio_tags(tree)
         self._handle_images(tree)
         self._handle_innerdocs(tree)
@@ -129 +133 @@
             span.append(text_a)
 
-    def _handle_text_a(self, tree):
+    def _relatorio_statements(self, tree):
+        # If this node href matches the relatorio URL it is kept.
+        # If this node href matches a genshi directive it is kept for further
+        # processing.
+        r_statements, genshi_dir = [], []
+        xlink_href_attrib = '{%s}href' % self.namespaces['xlink']
+        text_a = '{%s}a' % self.namespaces['text']
+        placeholder = '{%s}placeholder' % self.namespaces['text']
+
+        s_xpath = "//text:a[starts-with(@xlink:href, 'relatorio://')]" \
+                  "| //text:placeholder"
+        for statement in tree.xpath(s_xpath, namespaces=self.namespaces):
+            if statement.tag == placeholder:
+                expr = statement.text[1:-1]
+            elif statement.tag == text_a:
+                expr = urllib.unquote(statement.attrib[xlink_href_attrib][12:])
+
+            if not expr:
+                raise OOTemplateError("No expression in the tag",
+                                      self.filepath)
+            elif not statement.text:
+                warnings.warn('No statement text in %s' % self.filepath)
+            elif expr != statement.text and statement.tag == text_a:
+                warnings.warn('url and text do not match in %s: %s != %s' 
+                              % (self.filepath, expr,
+                                 statement.text.encode('utf-8')))
+
+            match_obj = GENSHI_EXPR.match(expr)
+
+            expr, closing, directive, _, attr, attr_val = match_obj.groups()
+            if directive is not None:
+                genshi_dir.append((statement, closing))
+            r_statements.append((statement, 
+                                 (expr, closing, directive, attr, attr_val)))
+
+        return r_statements, genshi_dir
+
+    def _handle_relatorio_tags(self, tree):
         """
-        Will treat all text:a tag (py:if/for/choose/when/otherwise)
+        Will treat all relatorio tag (py:if/for/choose/when/otherwise)
         tags
         """
@@ -139 +180 @@
         office_name = '{%s}value' % self.namespaces['office']
         office_valuetype = '{%s}value-type' % self.namespaces['office']
-        genshi_name = '{%s}replace' % self.namespaces['py']
-        xlink_href_attrib = '{%s}href' % self.namespaces['xlink']
-
-        # First we create the list of all the text:a nodes.
-        # If this node href matches the relatorio URL it is kept.
-        # If this node href matches a genshi directive it is kept for further
-        # processing.
-        genshi_directives, text_a = [], []
-        xpath_expr = "//text:a[starts-with(@xlink:href, 'relatorio://')]"
-        for statement in tree.xpath(xpath_expr, namespaces=self.namespaces):
-            href = urllib.unquote(statement.attrib[xlink_href_attrib])
-            match_obj = GENSHI_TAGS.match(href)
-            expr, closing, directive, _, attr, attr_val = match_obj.groups()
-            if expr != statement.text:
-                txt = statement.text or ''
-                warnings.warn('url and text do not match in %s: %s != %s' 
-                              % (self.filepath, expr, txt.encode('utf-8')))
-            if directive is not None:
-                genshi_directives.append((statement, href))
-            text_a.append((statement, 
-                           (expr, closing, directive, attr, attr_val)))
-
-        # Then we match the opening and closing directives together
+        genshi_replace = '{%s}replace' % self.namespaces['py']
+
+        r_statements, genshi_directives = self._relatorio_statements(tree)
+        # We match the opening and closing directives together
         idx = 0
         genshi_pairs, inserted = [], []
-        for statement, href in genshi_directives:
-            if not href.startswith('relatorio:///'):
+        for statement, closing in genshi_directives:
+            if closing is None:
                 genshi_pairs.append([statement, None])
                 inserted.append(idx)
@@ -172 +194 @@
                 genshi_pairs[inserted.pop()][1] = statement
 
-        for a_node, parsed in text_a:
+        for r_node, parsed in r_statements:
             expr, c_dir, directive, attr, a_val = parsed
 
             if directive is not None:
-                # If the text:a is a genshi directive statement:
+                # If the node is a genshi directive statement:
                 #    - we operate only on opening statement
                 #    - we find the nearest ancestor of the closing and opening
@@ -190 +212 @@
                     continue
                 for pair in genshi_pairs:
-                    if pair[0] == a_node:
+                    if pair[0] == r_node:
                         break
                 opening, closing = pair
@@ -220 +242 @@
             else:
                 # It's not a genshi statement it's a python expression
-                a_node.attrib['{%s}replace' % self.namespaces['py']] = expr
-                parent = a_node.getparent().getparent()
+                r_node.attrib[genshi_replace] = expr
+                parent = r_node.getparent().getparent()
                 if parent is None or parent.tag != table_cell_tag:
                     continue