[Erp5-report] r45088 nicolas - /erp5/trunk/products/ERP5OOo/transforms/

[nobody at svn.erp5.org]

Author: nicolas
Date: Tue Apr  5 14:56:22 2011
New Revision: 45088

URL: http://svn.erp5.org?rev=45088&view=rev
Log:
Honour format passed in parameters (src="image-reference?format=png")

Modified:
    erp5/trunk/products/ERP5OOo/transforms/oood_commandtransform.py

Modified: erp5/trunk/products/ERP5OOo/transforms/oood_commandtransform.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/transforms/oood_commandtransform.py?rev=45088&r1=45087&r2=45088&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/transforms/oood_commandtransform.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/transforms/oood_commandtransform.py [utf8] Tue Apr  5 14:56:22 2011
@@ -124,17 +124,18 @@ class OOOdCommandTransform(commandtransf
                                      'mimetypes_registry').lookup(content_type)
 
           format = image_parameter_dict.pop('format', None)
-          for mimetype_object in mimetype_list:
-            if mimetype_object.extensions:
-              format = mimetype_object.extensions[0]
-              break
-            elif mimetype_object.globs:
-              format = mimetype_object.globs.strip('*.')
-              break
+          if not format:
+            for mimetype_object in mimetype_list:
+              if mimetype_object.extensions:
+                format = mimetype_object.extensions[0]
+                break
+              elif mimetype_object.globs:
+                format = mimetype_object.globs.strip('*.')
+                break
           if getattr(image, 'meta_type', None) == 'ERP5 Image':
             #ERP5 API
             # resize image according parameters
-            mime, image_data = image.convert(None, **image_parameter_dict)
+            mime, image_data = image.convert(format, **image_parameter_dict)
             image = OFSImage(image.getId(), image.getTitle(), image_data)
 
           # image should be OFSImage