[Erp5-report] r14987 - in /erp5/trunk/products/ERP5OOo: OOoTemplate.py OOoUtils.py

[nobody at svn.erp5.org]

Author: yo
Date: Tue Jun 26 19:07:11 2007
New Revision: 14987

URL: http://svn.erp5.org?rev=14987&view=rev
Log:
Remove extra space.

Modified:
    erp5/trunk/products/ERP5OOo/OOoTemplate.py
    erp5/trunk/products/ERP5OOo/OOoUtils.py

Modified: erp5/trunk/products/ERP5OOo/OOoTemplate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/OOoTemplate.py?rev=14987&r1=14986&r2=14987&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/OOoTemplate.py (original)
+++ erp5/trunk/products/ERP5OOo/OOoTemplate.py Tue Jun 26 19:07:11 2007
@@ -26,12 +26,16 @@
 #
 ##############################################################################
 
+from Products.CMFCore.utils import getToolByName
 from types import StringType
 from Products.CMFCore.FSPageTemplate import FSPageTemplate
 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.PageTemplateFile import PageTemplateFile
 from Products.ERP5Type import PropertySheet
+from AccessControl import getSecurityManager
 from urllib import quote
 from Globals import InitializeClass, DTMLFile, get_request
 from AccessControl import ClassSecurityInfo
@@ -43,6 +47,9 @@
   from StringIO import StringIO
 import re
 import itertools
+import xmlrpclib
+
+from zLOG import LOG
 
 try:
   from webdav.Lockable import ResourceLockedError
@@ -374,7 +381,7 @@
       """ % (options_dict['style'], actual_idx,
              options_dict['x'], options_dict['y'],
              w, h,
-             is_legacy and '# ' or '',
+             is_legacy and '#' or '',
              pic_name.split('/')[-1] )
       if not (self.content_type.endswith('draw') or
               self.content_type.endswith('presentation') or
@@ -472,7 +479,7 @@
     opts = extra_context.get("options", None)
     if opts is not None:
       format = opts.get('format', request.get('format', None))
-      if format:
+      if format is not None:
         return self._asFormat(ooo, format, request)
 
     # Do not send a RESPONSE if in batch_mode
@@ -500,41 +507,36 @@
     """
     Return OOo report as pdf
     """
-    return self._asFormat(ooo, 'pdf', REQUEST)
-
-  def _asFormat(self, ooo, format, REQUEST=None):
+    return self._asFormat(ooo,'pdf',REQUEST)
+
+  def _asFormat(self,ooo,format,REQUEST=None):
     # now create a temp OOoDocument to convert data to pdf
     from Products.ERP5Type.Document import newTempOOoDocument
     tmp_ooo = newTempOOoDocument(self, self.title_or_id())
-    tmp_ooo.edit(base_data=ooo,
-                 fname=self.title_or_id(),
-                 source_reference=self.title_or_id(),
-                 base_content_type=self.content_type,)
+    tmp_ooo.edit(base_data = ooo,
+                fname =  self.title_or_id(),
+                source_reference = self.title_or_id(),
+                base_content_type = self.content_type,)
     tmp_ooo.oo_data = ooo
-    
     if format == 'pdf':
       # slightly different implementation
       # now convert it to pdf
-      tgts = [x[1] for x in tmp_ooo.getTargetFormatItemList()
-              if x[1].endswith('pdf')]
-      if len(tgts) > 1:
+      tgts=[x[1] for x in tmp_ooo.getTargetFormatItemList() if x[1].endswith('pdf')]
+      if len(tgts)>1:
           raise ValueError, 'multiple pdf formats found - this shouldnt happen'
-      if len(tgts) == 0:
+      if len(tgts)==0:
           raise ValueError, 'no pdf format found'
-      fmt = tgts[0]
+      fmt=tgts[0]
       mime, data = tmp_ooo.convert(fmt)
       if REQUEST is not None:
-        REQUEST.RESPONSE.setHeader('Content-type', 'application/pdf')
-        REQUEST.RESPONSE.setHeader('Content-disposition',
-                       'attachment;; filename="%s.pdf"' % self.title_or_id())
+          REQUEST.RESPONSE.setHeader('Content-type', 'application/pdf')
+          REQUEST.RESPONSE.setHeader('Content-disposition', 'attachment;; filename="%s.pdf"' % self.title_or_id())
       return data
-
     mime, data = tmp_ooo.convert(format)
     if REQUEST is not None:
-      REQUEST.RESPONSE.setHeader('Content-type', mime)
-      REQUEST.RESPONSE.setHeader('Content-disposition',
-               'attachment;; filename="%s.%s"' % (self.title_or_id(),format))
-      # FIXME the above lines should return zip format when html was requested
+        REQUEST.RESPONSE.setHeader('Content-type', mime)
+        REQUEST.RESPONSE.setHeader('Content-disposition', 'attachment;; filename="%s.%s"' % (self.title_or_id(),format))
+        # FIXME the above lines should return zip format when html was requested
     return data
 
 InitializeClass(OOoTemplate)

Modified: erp5/trunk/products/ERP5OOo/OOoUtils.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/OOoUtils.py?rev=14987&r1=14986&r2=14987&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/OOoUtils.py (original)
+++ erp5/trunk/products/ERP5OOo/OOoUtils.py Tue Jun 26 19:07:11 2007
@@ -199,7 +199,7 @@
     name = "Picture/%s.%s" % (count, format)
     self.replace(name, image)
     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')
   def render(self, name='', extension='sxw'):