[Erp5-report] r21031 - in /erp5/trunk/utils/oood: oood_common.py worker.py

[nobody at svn.erp5.org]

Author: nicolas
Date: Tue May 20 14:39:01 2008
New Revision: 21031

URL: http://svn.erp5.org?rev=21031&view=rev
Log:
Add support of Original Format (mimetype) in oood

Modified:
    erp5/trunk/utils/oood/oood_common.py
    erp5/trunk/utils/oood/worker.py

Modified: erp5/trunk/utils/oood/oood_common.py
URL: http://svn.erp5.org/erp5/trunk/utils/oood/oood_common.py?rev=21031&r1=21030&r2=21031&view=diff
==============================================================================
--- erp5/trunk/utils/oood/oood_common.py (original)
+++ erp5/trunk/utils/oood/oood_common.py Tue May 20 14:39:01 2008
@@ -197,7 +197,7 @@
   if type(a[0]) == types.DictType and len(a) > 1: raise MalformedRequest(malformed_request_message)
   # process
   if type(a[0]) == types.StringType:
-    argtpl=('filename', 'data', 'meta', 'extension')
+    argtpl=('filename', 'data', 'meta', 'extension', 'orig_format')
     kw = dict(zip(argtpl, a)) # build a dict from positional arguments
   if type(a[0]) == types.DictType:
     kw = a[0]

Modified: erp5/trunk/utils/oood/worker.py
URL: http://svn.erp5.org/erp5/trunk/utils/oood/worker.py?rev=21031&r1=21030&r2=21031&view=diff
==============================================================================
--- erp5/trunk/utils/oood/worker.py (original)
+++ erp5/trunk/utils/oood/worker.py Tue May 20 14:39:01 2008
@@ -250,6 +250,11 @@
       prop_name = PropertyValue("FilterName", 0, "Text (encoded)", 0)
       prop_encoding = PropertyValue("FilterOptions", 0, kw['encoding'], 0)
       inProps = (self.inProps[0], prop_name, prop_encoding)
+    if 'orig_format' in kw:
+      #Add Native Format if available to perform Transformation
+      proporty_dict = mimemapper.getTypePropertyDict(kw['orig_format'])
+      if proporty_dict is not None:
+        inProps = (inProps) + proporty_dict['outprops']
     try:
       self.doc = self.desktop.loadComponentFromURL(self.fileUrl, '_blank', 0, inProps)
       if getattr(self.doc, 'getTypes', None) is not None: