[Erp5-report] r38317 gabriel - /erp5/trunk/utils/cloudooo/cloudooo/

[nobody at svn.erp5.org]

Author: gabriel
Date: Mon Sep 13 19:22:28 2010
New Revision: 38317

URL: http://svn.erp5.org?rev=38317&view=rev
Log:
fix issue to export spreadsheet to html

Modified:
    erp5/trunk/utils/cloudooo/cloudooo/cloudooo.py
    erp5/trunk/utils/cloudooo/cloudooo/manager.py
    erp5/trunk/utils/cloudooo/cloudooo/ooolib.py

Modified: erp5/trunk/utils/cloudooo/cloudooo/cloudooo.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/cloudooo.py?rev=38317&r1=38316&r2=38317&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/cloudooo.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/cloudooo.py [utf8] Mon Sep 13 19:22:28 2010
@@ -102,7 +102,6 @@ def application(global_config, **local_c
   mimemapper.loadFilterList(application_hostname,
                             openoffice_port)
   openoffice.release()
-
   from manager import Manager
   timeout_response = int(local_config.get('timeout_response'))
   kw = dict(timeout=timeout_response)

Modified: erp5/trunk/utils/cloudooo/cloudooo/manager.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/manager.py?rev=38317&r1=38316&r2=38317&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/manager.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/manager.py [utf8] Mon Sep 13 19:22:28 2010
@@ -202,11 +202,13 @@ class Manager(object):
       # XXX - use html format instead of xhtml
       if orig_format == "presentation" and format == "xhtml":
         format = 'html'
+      elif orig_format == "spreadsheet" and format in ("html", "xhtml"):
+        format = "htm"
       response_dict['data'] = self.convertFile(file, orig_format, format, zip)
       # FIXME: Fast solution to obtain the html or pdf mimetypes
       if zip:
         response_dict['mime'] = "application/zip"
-      elif format == "html":
+      elif format in ("html", "htm", "xhtml"):
         response_dict['mime'] = "text/html"
       elif format == "pdf":
         response_dict['mime'] = "application/pdf"

Modified: erp5/trunk/utils/cloudooo/cloudooo/ooolib.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/ooolib.py?rev=38317&r1=38316&r2=38317&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/ooolib.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/ooolib.py [utf8] Mon Sep 13 19:22:28 2010
@@ -75,7 +75,7 @@ def createSpecificProperty(filter_name):
     property = PropertyValue('FilterData', 0,
                        uno.Any('[]com.sun.star.beans.PropertyValue',
                        (PropertyValue('ExportNotesPages', 0, True, 0),),), 0)
-  elif filter_name == "draw_html_Export":
+  elif filter_name in ("draw_html_Export", "HTML (StarCalc)"):
     property = PropertyValue('FilterData', 0,
                         uno.Any('[]com.sun.star.beans.PropertyValue',
                                 (PropertyValue('Format', 0, 2, 0),),), 0)