[Erp5-report] r29009 - /erp5/trunk/products/ERP5/Document/Image.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Sep 14 10:07:35 CEST 2009
Author: nicolas
Date: Mon Sep 14 10:07:33 2009
New Revision: 29009
URL: http://svn.erp5.org?rev=29009&view=rev
Log:
revert r28985 as this implementation is slower because of hasConversion
Modified:
erp5/trunk/products/ERP5/Document/Image.py
Modified: erp5/trunk/products/ERP5/Document/Image.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/Image.py?rev=29009&r1=29008&r2=29009&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/Image.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/Image.py [utf8] Mon Sep 14 10:07:33 2009
@@ -337,30 +337,28 @@
Implementation of conversion for Image files
"""
if format in ('text', 'txt', 'html', 'base_html', 'stripped-html'):
- if not self.hasConversion(format=format):
+ try:
+ return self.getConversion(format=format)
+ except KeyError:
mime_type, data = self._convertToText(format)
data = aq_base(data)
self.setConversion(data, mime=mime_type, format=format)
- else:
- mime_type, data = self.getConversion(format=format)
- return mime_type, data
+ return mime_type, data
image_size = self.getSizeFromImageDisplay(display)
if (display is not None or resolution is not None or quality != 75 or format != ''\
or frame is not None) and image_size:
- if not self.hasConversion(display=display, format=format,
- quality=quality, resolution=resolution,
- frame=frame, image_size=image_size):
+ try:
+ return self.getConversion(display=display, format=format,
+ quality=quality, resolution=resolution,
+ frame=frame, image_size=image_size)
+ except KeyError:
mime, image = self._makeDisplayPhoto(display, format=format, quality=quality,
resolution=resolution, frame=frame,
image_size=image_size)
self.setConversion(image, mime, format=format, quality=quality,
resolution=resolution, frame=frame,
image_size=image_size)
- else:
- mime, image = self.getConversion(display=display, format=format,
- quality=quality, resolution=resolution,
- frame=frame, image_size=image_size)
- return mime, image.data
+ return mime, image
return self.getContentType(), self.getData()
security.declareProtected(Permissions.View, 'getSearchableText')
More information about the Erp5-report
mailing list