[Erp5-report] r42452 kazuhiko - /erp5/trunk/utils/cloudooo/cloudooo/manager.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Wed Jan 19 13:15:03 2011
New Revision: 42452

URL: http://svn.erp5.org?rev=42452&view=rev
Log:
now we use html extension everywhere, not htm. and also output better log in case of unsupported format.

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

Modified: erp5/trunk/utils/cloudooo/cloudooo/manager.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/manager.py?rev=42452&r1=42451&r2=42452&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/manager.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/manager.py [utf8] Wed Jan 19 13:15:03 2011
@@ -56,7 +56,7 @@ class Manager(object):
       zip archive
     """
     if not mimemapper.getFilterList(destination_format):
-      raise ValueError, "This format is not supported or is invalid"
+      raise ValueError, "This format (%s) is not supported or is invalid" % destination_format
     self.kw['zip'] = zip
     self.kw['refresh'] = refresh
     document = OOHandler(self._path_tmp_dir,
@@ -243,11 +243,8 @@ class Manager(object):
     try:
       response_dict = {}
       # XXX - use html format instead of xhtml
-      if orig_format in ("presentation", "graphics") and extension == "xhtml":
+      if orig_format in ("presentation", "graphics", "spreadsheet", 'text') and extension == "xhtml":
         extension = 'html'
-      elif orig_format in ("spreadsheet", 'text') and extension in ("html",
-                                                                    "xhtml"):
-        extension = "htm"
       response_dict['data'] = self.convertFile(data,
                                                original_extension,
                                                extension,