Commit bf0931f7 authored by Yoshinori Okuji's avatar Yoshinori Okuji

Remove extra space.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@14987 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent f70e8e24
...@@ -26,12 +26,16 @@ ...@@ -26,12 +26,16 @@
# #
############################################################################## ##############################################################################
from Products.CMFCore.utils import getToolByName
from types import StringType from types import StringType
from Products.CMFCore.FSPageTemplate import FSPageTemplate from Products.CMFCore.FSPageTemplate import FSPageTemplate
from Products.CMFCore.DirectoryView import registerFileExtension, registerMetaType from Products.CMFCore.DirectoryView import registerFileExtension, registerMetaType
from Products.Formulator.Form import BasicForm
from Products.Formulator.Form import fields
from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
from Products.PageTemplates.PageTemplateFile import PageTemplateFile from Products.PageTemplates.PageTemplateFile import PageTemplateFile
from Products.ERP5Type import PropertySheet from Products.ERP5Type import PropertySheet
from AccessControl import getSecurityManager
from urllib import quote from urllib import quote
from Globals import InitializeClass, DTMLFile, get_request from Globals import InitializeClass, DTMLFile, get_request
from AccessControl import ClassSecurityInfo from AccessControl import ClassSecurityInfo
...@@ -43,6 +47,9 @@ except ImportError: ...@@ -43,6 +47,9 @@ except ImportError:
from StringIO import StringIO from StringIO import StringIO
import re import re
import itertools import itertools
import xmlrpclib
from zLOG import LOG
try: try:
from webdav.Lockable import ResourceLockedError from webdav.Lockable import ResourceLockedError
...@@ -374,7 +381,7 @@ xmlns:config="http://openoffice.org/2001/config" office:version="1.0"> ...@@ -374,7 +381,7 @@ xmlns:config="http://openoffice.org/2001/config" office:version="1.0">
""" % (options_dict['style'], actual_idx, """ % (options_dict['style'], actual_idx,
options_dict['x'], options_dict['y'], options_dict['x'], options_dict['y'],
w, h, w, h,
is_legacy and '# ' or '', is_legacy and '#' or '',
pic_name.split('/')[-1] ) pic_name.split('/')[-1] )
if not (self.content_type.endswith('draw') or if not (self.content_type.endswith('draw') or
self.content_type.endswith('presentation') or self.content_type.endswith('presentation') or
...@@ -472,7 +479,7 @@ xmlns:config="http://openoffice.org/2001/config" office:version="1.0"> ...@@ -472,7 +479,7 @@ xmlns:config="http://openoffice.org/2001/config" office:version="1.0">
opts = extra_context.get("options", None) opts = extra_context.get("options", None)
if opts is not None: if opts is not None:
format = opts.get('format', request.get('format', None)) format = opts.get('format', request.get('format', None))
if format: if format is not None:
return self._asFormat(ooo, format, request) return self._asFormat(ooo, format, request)
# Do not send a RESPONSE if in batch_mode # Do not send a RESPONSE if in batch_mode
...@@ -500,40 +507,35 @@ xmlns:config="http://openoffice.org/2001/config" office:version="1.0"> ...@@ -500,40 +507,35 @@ xmlns:config="http://openoffice.org/2001/config" office:version="1.0">
""" """
Return OOo report as pdf Return OOo report as pdf
""" """
return self._asFormat(ooo, 'pdf', REQUEST) return self._asFormat(ooo,'pdf',REQUEST)
def _asFormat(self, ooo, format, REQUEST=None): def _asFormat(self,ooo,format,REQUEST=None):
# now create a temp OOoDocument to convert data to pdf # now create a temp OOoDocument to convert data to pdf
from Products.ERP5Type.Document import newTempOOoDocument from Products.ERP5Type.Document import newTempOOoDocument
tmp_ooo = newTempOOoDocument(self, self.title_or_id()) tmp_ooo = newTempOOoDocument(self, self.title_or_id())
tmp_ooo.edit(base_data=ooo, tmp_ooo.edit(base_data = ooo,
fname=self.title_or_id(), fname = self.title_or_id(),
source_reference=self.title_or_id(), source_reference = self.title_or_id(),
base_content_type=self.content_type,) base_content_type = self.content_type,)
tmp_ooo.oo_data = ooo tmp_ooo.oo_data = ooo
if format == 'pdf': if format == 'pdf':
# slightly different implementation # slightly different implementation
# now convert it to pdf # now convert it to pdf
tgts = [x[1] for x in tmp_ooo.getTargetFormatItemList() tgts=[x[1] for x in tmp_ooo.getTargetFormatItemList() if x[1].endswith('pdf')]
if x[1].endswith('pdf')] if len(tgts)>1:
if len(tgts) > 1:
raise ValueError, 'multiple pdf formats found - this shouldnt happen' raise ValueError, 'multiple pdf formats found - this shouldnt happen'
if len(tgts) == 0: if len(tgts)==0:
raise ValueError, 'no pdf format found' raise ValueError, 'no pdf format found'
fmt = tgts[0] fmt=tgts[0]
mime, data = tmp_ooo.convert(fmt) mime, data = tmp_ooo.convert(fmt)
if REQUEST is not None: if REQUEST is not None:
REQUEST.RESPONSE.setHeader('Content-type', 'application/pdf') REQUEST.RESPONSE.setHeader('Content-type', 'application/pdf')
REQUEST.RESPONSE.setHeader('Content-disposition', REQUEST.RESPONSE.setHeader('Content-disposition', 'attachment;; filename="%s.pdf"' % self.title_or_id())
'attachment;; filename="%s.pdf"' % self.title_or_id())
return data return data
mime, data = tmp_ooo.convert(format) mime, data = tmp_ooo.convert(format)
if REQUEST is not None: if REQUEST is not None:
REQUEST.RESPONSE.setHeader('Content-type', mime) REQUEST.RESPONSE.setHeader('Content-type', mime)
REQUEST.RESPONSE.setHeader('Content-disposition', REQUEST.RESPONSE.setHeader('Content-disposition', 'attachment;; filename="%s.%s"' % (self.title_or_id(),format))
'attachment;; filename="%s.%s"' % (self.title_or_id(),format))
# FIXME the above lines should return zip format when html was requested # FIXME the above lines should return zip format when html was requested
return data return data
......
...@@ -199,7 +199,7 @@ class OOoBuilder: ...@@ -199,7 +199,7 @@ class OOoBuilder:
name = "Picture/%s.%s" % (count, format) name = "Picture/%s.%s" % (count, format)
self.replace(name, image) self.replace(name, image)
is_legacy = ('oasis.opendocument' not in self.getMimeType()) is_legacy = ('oasis.opendocument' not in self.getMimeType())
return "%s%s" % (is_legacy and '# ' or '', name,) return "%s%s" % (is_legacy and '#' or '', name,)
security.declarePublic('render') security.declarePublic('render')
def render(self, name='', extension='sxw'): def render(self, name='', extension='sxw'):
......
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