Commit 84a82483 authored by Julien Muchembled's avatar Julien Muchembled

Replacement of <office:include_img> tags:

* Use accessor to get content type (default value is 'application/unknown').
* Revert r23844 because it would fail later anyway.
* Access data member directly instead of using getData because OFS images doesn't have getData.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@23969 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 594b9332
...@@ -347,31 +347,24 @@ xmlns:config="http://openoffice.org/2001/config" office:version="1.0"> ...@@ -347,31 +347,24 @@ xmlns:config="http://openoffice.org/2001/config" office:version="1.0">
picture = self._resolvePath(options_dict.pop('path').encode()) picture = self._resolvePath(options_dict.pop('path').encode())
# "standard" filetype == Image or File , for ERP objects the
# manipulations are different
is_standard_filetype = True
# If this is not a File, build a new file with this content # If this is not a File, build a new file with this content
if not isinstance(picture, File): if not isinstance(picture, File):
tmp_picture = Products.ERP5Type.Document.newTempImage(self, 'tmp') tmp_picture = Products.ERP5Type.Document.newTempImage(self, 'tmp')
tmp_picture.setData(picture()) tmp_picture.setData(picture())
picture = tmp_picture picture = tmp_picture
if getattr(aq_base(picture), 'data', None) is None \ picture_type = options_dict.pop('type', None)
or callable(aq_base(picture).content_type):
is_standard_filetype = False
if is_standard_filetype: picture_data = getattr(aq_base(picture), 'data', None)
picture_data = str(picture.getData()) if picture_data is None:
else:
picture_data = picture.Base_download() picture_data = picture.Base_download()
# fetch the content-type of the picture (generally guessed by zope)
picture_type = options_dict.pop('type', None)
if picture_type is None: if picture_type is None:
picture_type = picture.content_type picture_type = picture.content_type()
if not is_standard_filetype: else:
picture_type = picture_type() # "standard" filetype case (Image or File)
picture_data = str(picture_data)
if picture_type is None:
picture_type = picture.getContentType()
w, h, maxwidth, maxheight = getLengthInfos(options_dict, w, h, maxwidth, maxheight = getLengthInfos(options_dict,
('width', 'height', 'maxwidth', 'maxheight')) ('width', 'height', 'maxwidth', 'maxheight'))
...@@ -405,8 +398,7 @@ xmlns:config="http://openoffice.org/2001/config" office:version="1.0"> ...@@ -405,8 +398,7 @@ xmlns:config="http://openoffice.org/2001/config" office:version="1.0">
actual_idx = self.document_counter.next() actual_idx = self.document_counter.next()
pic_name = 'Pictures/picture%d%s' \ pic_name = 'Pictures/picture%d%s' \
% (actual_idx, % (actual_idx, guess_extension(picture_type) or '')
picture_type and guess_extension(picture_type) or '')
# XXX: Pictures directory not managed (seems facultative) # XXX: Pictures directory not managed (seems facultative)
# <manifest:file-entry manifest:media-type="" manifest:full-path="ObjBFE4F50D/Pictures/"/> # <manifest:file-entry manifest:media-type="" manifest:full-path="ObjBFE4F50D/Pictures/"/>
......
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