[Erp5-report] r44584 nicolas - /erp5/trunk/products/ERP5/Document/

[nobody at svn.erp5.org]

Author: nicolas
Date: Thu Mar 24 18:05:21 2011
New Revision: 44584

URL: http://svn.erp5.org?rev=44584&view=rev
Log:
filename argument is understood as original filename by portal_transforms.
Give original filename instead of converted filename, to not confuse transforms behind
portal_transforms.


Modified:
    erp5/trunk/products/ERP5/Document/Image.py
    erp5/trunk/products/ERP5/Document/PDFDocument.py
    erp5/trunk/products/ERP5/Document/TextDocument.py

Modified: erp5/trunk/products/ERP5/Document/Image.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Image.py?rev=44584&r1=44583&r2=44584&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Image.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Image.py [utf8] Thu Mar 24 18:05:21 2011
@@ -247,7 +247,7 @@ class Image(TextConvertableMixin, File, 
     portal_transforms = portal.portal_transforms
     result = portal_transforms.convertToData(mime_type, content,
                                              object=self, context=self,
-                                             filename=self.getTitleOrId(),
+                                             filename=self.getFilename(),
                                              mimetype=src_mimetype)
     if result is None:
       # portal_transforms fails to convert.

Modified: erp5/trunk/products/ERP5/Document/PDFDocument.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/PDFDocument.py?rev=44584&r1=44583&r2=44584&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/PDFDocument.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/PDFDocument.py [utf8] Thu Mar 24 18:05:21 2011
@@ -123,7 +123,7 @@ class PDFDocument(Image):
       return ''
     mime_type = 'text/plain'
     portal_transforms = self.getPortalObject().portal_transforms
-    filename = self.getStandardFilename(format='txt')
+    filename = self.getFilename()
     result = portal_transforms.convertToData(mime_type, str(self.getData()),
                                              context=self, filename=filename,
                                              mimetype=self.getContentType())

Modified: erp5/trunk/products/ERP5/Document/TextDocument.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/TextDocument.py?rev=44584&r1=44583&r2=44584&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/TextDocument.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/TextDocument.py [utf8] Thu Mar 24 18:05:21 2011
@@ -155,7 +155,7 @@ class TextDocument(CachedConvertableMixi
           kw['charset'] = convert_kw['encoding'] = charset
         if not self.hasConversion(**kw):
           portal_transforms = portal.portal_transforms
-          filename = self.getStandardFilename(format=format)
+          filename = self.getFilename()
           if mime_type == 'text/html':
             mime_type = 'text/x-html-safe'
           result = portal_transforms.convertToData(mime_type, text_content,