[Erp5-report] r44747 nicolas - /erp5/trunk/utils/cloudooo/cloudooo/manager.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Tue Mar 29 19:10:53 2011
New Revision: 44747

URL: http://svn.erp5.org?rev=44747&view=rev
Log:
Maintain legacy interface without overkill conversion server.
It is not acceptable to call ooo backend twice just to return the mimetype
of the converted data that user explicity asked for.

Use mimetypes module instead.
(If it is not enough, API of cloudooo support a new method to 
return conversion and metadata extraction in unique call)




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=44747&r1=44746&r2=44747&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/manager.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/manager.py [utf8] Tue Mar 29 19:10:53 2011
@@ -263,14 +263,10 @@ class Manager(object):
       # FIXME: Fast solution to obtain the html or pdf mimetypes
       if zip:
         response_dict['mime'] = "application/zip"
-      elif extension in ("html", "htm", "xhtml"):
+      elif extension == 'xhtml':
         response_dict['mime'] = "text/html"
-      elif extension == "pdf":
-        response_dict['mime'] = "application/pdf"
       else:
-        response_dict['mime'] = self.getFileMetadataItemList(
-                                                         response_dict['data'],
-                                                         extension)['MIMEType']
+        response_dict['mime'] = mimetypes.types_map.get('.%s' % extension)
       return (200, response_dict, "")
     except Exception, e:
       logger.error(e)