[Erp5-report] r45265 nicolas - /erp5/trunk/products/ERP5OOo/transforms/

[nobody at svn.erp5.org]

Author: nicolas
Date: Fri Apr  8 17:32:53 2011
New Revision: 45265

URL: http://svn.erp5.org?rev=45265&view=rev
Log:
workaround a Bug in LibreOffice HTML import filter.
https://bugs.freedesktop.org/show_bug.cgi?id=36080


Modified:
    erp5/trunk/products/ERP5OOo/transforms/html_to_odt.py
    erp5/trunk/products/ERP5OOo/transforms/oood_commandtransform.py

Modified: erp5/trunk/products/ERP5OOo/transforms/html_to_odt.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/transforms/html_to_odt.py?rev=45265&r1=45264&r2=45265&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/transforms/html_to_odt.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/transforms/html_to_odt.py [utf8] Fri Apr  8 17:32:53 2011
@@ -44,6 +44,10 @@ class HTMLToOdt:
                                   'content': 'text/html; charset=utf-8'})
     orig = html.tostring(html_node, encoding='utf-8', method='xml')
 
+    # workaround a Bug in LibreOffice HTML import filter.
+    # https://bugs.freedesktop.org/show_bug.cgi?id=36080
+    orig = orig.replace('<title/>', '<title></title>')
+    import pdb;pdb.set_trace()
     doc = OOOdCommandTransform(context, filename, orig, self.inputs[0])
     odt = doc.convertTo('odt')
     if cache is not None:

Modified: erp5/trunk/products/ERP5OOo/transforms/oood_commandtransform.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/transforms/oood_commandtransform.py?rev=45265&r1=45264&r2=45265&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/transforms/oood_commandtransform.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/transforms/oood_commandtransform.py [utf8] Fri Apr  8 17:32:53 2011
@@ -12,6 +12,7 @@ from zLOG import LOG
 from Products.ERP5OOo.OOoUtils import OOoBuilder
 import re
 from lxml import etree
+from lxml import html
 from lxml.etree import ParseError, Element
 
 from urllib import unquote
@@ -193,8 +194,9 @@ class OOOdCommandTransform(commandtransf
           parent_node.append(style_node)
           style_node.attrib.update({'type': 'text/css'})
           parent_node.remove(css_link_tag)
-    return etree.tostring(xml_doc, encoding='utf-8',
-                          xml_declaration=False, pretty_print=False, )
+    xml_output = html.tostring(xml_doc, encoding='utf-8', method='xml')
+    xml_output = xml_output.replace('<title/>', '<title></title>')
+    return xml_output
 
   def convertTo(self, format):
     server_proxy = OOoServerProxy(self.context)