Commit 5eecd749 authored by Nicolas Delaby's avatar Nicolas Delaby

revert r28985 as this implementation is slower because of hasConversion

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@29009 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 2f48dce8
...@@ -337,30 +337,28 @@ class Image(File, OFSImage): ...@@ -337,30 +337,28 @@ class Image(File, OFSImage):
Implementation of conversion for Image files Implementation of conversion for Image files
""" """
if format in ('text', 'txt', 'html', 'base_html', 'stripped-html'): 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) mime_type, data = self._convertToText(format)
data = aq_base(data) data = aq_base(data)
self.setConversion(data, mime=mime_type, format=format) 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) image_size = self.getSizeFromImageDisplay(display)
if (display is not None or resolution is not None or quality != 75 or format != ''\ if (display is not None or resolution is not None or quality != 75 or format != ''\
or frame is not None) and image_size: or frame is not None) and image_size:
if not self.hasConversion(display=display, format=format, try:
return self.getConversion(display=display, format=format,
quality=quality, resolution=resolution, quality=quality, resolution=resolution,
frame=frame, image_size=image_size): frame=frame, image_size=image_size)
except KeyError:
mime, image = self._makeDisplayPhoto(display, format=format, quality=quality, mime, image = self._makeDisplayPhoto(display, format=format, quality=quality,
resolution=resolution, frame=frame, resolution=resolution, frame=frame,
image_size=image_size) image_size=image_size)
self.setConversion(image, mime, format=format, quality=quality, self.setConversion(image, mime, format=format, quality=quality,
resolution=resolution, frame=frame, resolution=resolution, frame=frame,
image_size=image_size) image_size=image_size)
else: return mime, image
mime, image = self.getConversion(display=display, format=format,
quality=quality, resolution=resolution,
frame=frame, image_size=image_size)
return mime, image.data
return self.getContentType(), self.getData() return self.getContentType(), self.getData()
security.declareProtected(Permissions.View, 'getSearchableText') security.declareProtected(Permissions.View, 'getSearchableText')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment