[Erp5-report] r44742 nicolas - /erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/helper/

[nobody at svn.erp5.org]

Author: nicolas
Date: Tue Mar 29 18:57:59 2011
New Revision: 44742

URL: http://svn.erp5.org?rev=44742&view=rev
Log:
Pass open_new_view argument to enable opening same document twice.
Small refactoring for readability

Modified:
    erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/helper/unoconverter.py

Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/helper/unoconverter.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/helper/unoconverter.py?rev=44742&r1=44741&r2=44742&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/helper/unoconverter.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/helper/unoconverter.py [utf8] Tue Mar 29 18:57:59 2011
@@ -220,14 +220,13 @@ class UnoConverter(object):
         fieldname = document_info.getUserFieldName(number)
         metadata[fieldname] = field_value_str
     service_manager = helper_utils.getServiceManager(self.hostname, self.port)
+    type_detection = service_manager.createInstance("com.sun.star.document.TypeDetection")
     uno_file_access = service_manager.createInstance("com.sun.star.ucb.SimpleFileAccess")
     doc = uno_file_access.openFileRead(self.systemPathToFileUrl(self.document_url))
-    property_list = []
-    property = self._createProperty("InputStream", doc)
-    property_list.append(property)
-    type_detection = service_manager.createInstance("com.sun.star.document.TypeDetection")
-    filter_name = type_detection.queryTypeByDescriptor(tuple(property_list), \
-        True)[0]
+    input_stream = self._createProperty("InputStream", doc)
+    open_new_view = self._createProperty("OpenNewView", True)
+    filter_name = type_detection.queryTypeByDescriptor((input_stream,
+                                                        open_new_view), True)[0]
     doc.closeInput()
     metadata['MIMEType'] = mimemapper["mimetype_by_filter_type"].get(filter_name)
     return metadata