Changeset 44:1f2dc9016aa2

Timestamp:

08/07/08 19:10:57 (5 years ago)

Author:

Nicolas ?vrard <nicoe@…>

Branch:

default

Message:

Correctly handle styles in xlink
Use more sophisticated xpath (should be faster its implemented in C)
Warns when the relatorio URL does not match the text content.

Files:

• examples/basic.odt (modified) (previous)
• examples/presentation.odp (modified) (previous)
• relatorio/templates/opendocument.py (modified) (4 diffs)

relatorio/templates/opendocument.py

@@ -27 +27 @@
 import zipfile
 from cStringIO import StringIO
+
+import warnings
+warnings.filterwarnings('always', module='relatorio.templates.opendocument')
 
 import lxml.etree
@@ -108 +111 @@
         self.namespaces['py'] = 'http://genshi.edgewall.org/'
 
+        self._invert_style(tree)
         self._handle_text_a(tree)
         self._handle_images(tree)
         self._handle_innerdocs(tree)
         return StringIO(lxml.etree.tostring(tree))
+
+    def _invert_style(self, tree):
+        xpath_expr = "//text:a[starts-with(@xlink:href, 'relatorio://')]"\
+                     "/text:span"
+        for span in tree.xpath(xpath_expr, namespaces=self.namespaces):
+            text_a = span.getparent()
+            outer = text_a.getparent()
+            text_a.text = span.text
+            span.text = ''
+            text_a.remove(span)
+            outer.replace(text_a, span)
+            span.append(text_a)
 
     def _handle_text_a(self, tree):
@@ -131 +147 @@
         # processing.
         genshi_directives, text_a = [], []
-        for statement in tree.xpath('//text:a', namespaces=self.namespaces):
+        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)
-            if match_obj is None:
-                continue
             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))
@@ -216 +235 @@
         draw_image = '{%s}image' % self.namespaces['draw']
         python_attrs = '{%s}attrs' % self.namespaces['py']
-        for draw in tree.xpath('//draw:frame', namespaces=self.namespaces):
-            d_name = draw.attrib.get(draw_name, '')
-            if d_name.startswith('image: '):
-                attr_expr = "make_href(%s, %r)" % (d_name[7:], d_name[7:])
-                image_node = ETElement(draw_image, 
-                                       attrib={python_attrs: attr_expr},
-                                       nsmap=self.namespaces)
-                draw.replace(draw[0], image_node)
+        xpath_expr = "//draw:frame[starts-with(@draw:name, 'image:')]"
+        for draw in tree.xpath(xpath_expr, namespaces=self.namespaces):
+            d_name = draw.attrib[draw_name]
+            attr_expr = "make_href(%s, %r)" % (d_name[7:], d_name[7:])
+            image_node = ETElement(draw_image, 
+                                   attrib={python_attrs: attr_expr},
+                                   nsmap=self.namespaces)
+            draw.replace(draw[0], image_node)
 
     def _handle_innerdocs(self, tree):
         href_attrib = '{%s}href' % self.namespaces['xlink']
-        show_attrib = '{%s}show' % self.namespaces['xlink']
-        for draw in tree.xpath('//draw:object', namespaces=self.namespaces):
-            href = draw.attrib.get(href_attrib, '')
-            show = draw.attrib.get(show_attrib, '')
-            if href.startswith('./') and show == 'embed':
-                self.inner_docs.append(href[2:])
+        xpath_expr = "//draw:object[starts-with(@xlink:href, './')" \
+                     "and @xlink:show='embed']"
+        for draw in tree.xpath(xpath_expr, namespaces=self.namespaces):
+            self.inner_docs.append(draw.attrib[href_attrib][2:])
 
     def generate(self, *args, **kwargs):