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

[nobody at svn.erp5.org]

Author: ivan
Date: Tue Jul 13 08:43:39 2010
New Revision: 37074

URL: http://svn.erp5.org?rev=37074&view=rev
Log:
Any OOoDocument can make use of 'display', 'quality', 'resolution' arguments in default download like an Image (i.e. converted to an image respectively if image format passed).

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=37074&r1=37073&r2=37074&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/Document/OOoDocument.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/Document/OOoDocument.py [utf8] Tue Jul 13 08:43:39 2010
@@ -48,6 +48,7 @@ from Products.ERP5.Document.File import 
 from Products.ERP5.Document.Document import Document, PermanentURLMixIn,\
 VALID_IMAGE_FORMAT_LIST, ConversionError, NotConvertedError
 from AccessControl.SecurityManagement import setSecurityManager
+from Products.ERP5Type.Utils import fill_args_from_request
 from zLOG import LOG, ERROR
 
 # Mixin Import
@@ -154,6 +155,12 @@ class OOoDocument(PermanentURLMixIn, Bas
   rx_strip = re.compile('<[^>]*?>', re.DOTALL|re.MULTILINE)
   rx_compr = re.compile('\s+')
 
+  security.declareProtected('View', 'index_html')
+  @fill_args_from_request('display', 'quality', 'resolution')
+  def index_html(self, REQUEST, *args, **kw):
+    """Return the document data."""
+    return Document.index_html(self, REQUEST, *args, **kw)
+
   security.declareProtected(Permissions.AccessContentsInformation,
                             'isSupportBaseDataConversion')
   def isSupportBaseDataConversion(self):
@@ -372,13 +379,14 @@ class OOoDocument(PermanentURLMixIn, Bas
         and not requires_pdf_first:
         self.setConversion(data, mime, format=original_format)
       else:
+        # create temporary image and use it to resize accordingly
         temp_image = self.portal_contributions.newContent(
                                        portal_type='Image',
                                        file=cStringIO.StringIO(),
                                        file_name=self.getId(),
                                        temp_object=1)
         temp_image._setData(data)
-        mime, data = temp_image.convert(original_format, display=display)
+        mime, data = temp_image.convert(original_format, display=display, **kw)
         if requires_pdf_first:
           if display is None:
             self.setConversion(data, mime, format=original_format)