[Erp5-report] r28892 - /erp5/trunk/products/ERP5OOo/Document/OOoDocument.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Thu Sep 10 12:03:33 2009
New Revision: 28892

URL: http://svn.erp5.org?rev=28892&view=rev
Log:
Cache text conversion for all OOoDocuments

Modified:
    erp5/trunk/products/ERP5OOo/Document/OOoDocument.py

Modified: erp5/trunk/products/ERP5OOo/Document/OOoDocument.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/Document/OOoDocument.py?rev=28892&r1=28891&r2=28892&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/Document/OOoDocument.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/Document/OOoDocument.py [utf8] Thu Sep 10 12:03:33 2009
@@ -388,7 +388,13 @@
       if 'enc.txt' in format_list:
         format = 'enc.txt'
       elif format not in format_list:
-        return self.asTextContent()
+        #Text conversion is not supported by oood, do it in other way
+        if not self.hasConversion(format=original_format):
+          #Do real conversion for text
+          mime, data = self._convert(format='text-content')
+          self.setConversion(data, mime, format=original_format)
+          return mime, data
+        return self.getConversion(format=original_format)
     # Raise an error if the format is not supported
     if not self.isTargetFormatAllowed(format):
       raise ConversionError("OOoDocument: target format %s is not supported" % format)
@@ -463,7 +469,11 @@
       This is the simplest way, the most universal and it is compatible
       will all formats.
     """
-    return self._convert(format='text-content')
+    if not self.hasConversion(format='txt'):
+      mime, data = self._convert(format='text-content')
+      self.setConversion(data, mime, format='txt')
+      return mime, data
+    return self.getConversion(format='txt')
 
   security.declareProtected(Permissions.ModifyPortalContent,
                             '_populateConversionCacheWithHTML')