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

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Fri Sep 25 10:25:17 2009
New Revision: 29178

URL: http://svn.erp5.org?rev=29178&view=rev
Log:
fix a mistake in r29137.
(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=29178&r1=29177&r2=29178&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/Document/OOoDocument.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/Document/OOoDocument.py [utf8] Fri Sep 25 10:25:17 2009
@@ -198,16 +198,13 @@
     converted_filename = '%s.%s'%(filename.split('.')[0],  format)
     if not mime:
       mime = getToolByName(self, 'mimetypes_registry').lookupExtension('name.%s' % format)
-    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-Length', len(result))
+    RESPONSE.setHeader('Content-Type', mime)
+    RESPONSE.setHeader('Accept-Ranges', 'bytes')
+    if format not in STANDARD_IMAGE_FORMAT_LIST:
       RESPONSE.setHeader('Content-Disposition',
                          'attachment; filename="%s"' % converted_filename)
-      return result
+    return result
 
   # Format conversion implementation
   def _getServerCoordinate(self):