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

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Tue Sep 22 17:15:23 2009
New Revision: 29137

URL: http://svn.erp5.org?rev=29137&view=rev
Log:
display converted result in the browser if requested format is standard image format.

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=29137&r1=29136&r2=29137&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/Document/OOoDocument.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/Document/OOoDocument.py [utf8] Tue Sep 22 17:15:23 2009
@@ -198,12 +198,16 @@
     converted_filename = '%s.%s'%(filename.split('.')[0],  format)
     if not mime:
       mime = getToolByName(self, 'mimetypes_registry').lookupExtension('name.%s' % format)
-    RESPONSE.setHeader('Content-Length', len(result))
-    RESPONSE.setHeader('Content-Type', mime)
-    RESPONSE.setHeader('Accept-Ranges', 'bytes')
-    RESPONSE.setHeader('Content-Disposition',
-                       'attachment; filename="%s"' % converted_filename)
-    return result
+    if format in STANDARD_IMAGE_FORMAT_LIST:
+      RESPONSE.setHeader('Content-Type', mime)
+      return result.index_html(REQUEST, RESPONSE)
+    else:
+      RESPONSE.setHeader('Content-Length', len(result))
+      RESPONSE.setHeader('Content-Type', mime)
+      RESPONSE.setHeader('Accept-Ranges', 'bytes')
+      RESPONSE.setHeader('Content-Disposition',
+                         'attachment; filename="%s"' % converted_filename)
+      return result
 
   # Format conversion implementation
   def _getServerCoordinate(self):