[Erp5-report] r44737 nicolas - in /erp5/trunk/utils/cloudooo/cloudooo/handler/ooo: ./ helper/

[nobody at svn.erp5.org]

Author: nicolas
Date: Tue Mar 29 17:35:39 2011
New Revision: 44737

URL: http://svn.erp5.org?rev=44737&view=rev
Log:
Modify return value name to improve readability of code

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

Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/handler.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/handler.py?rev=44737&r1=44736&r2=44737&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/handler.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/handler.py [utf8] Tue Mar 29 17:35:39 2011
@@ -192,9 +192,10 @@ class Handler(object):
     finally:
       openoffice.release()
     metadata = json.loads(decodestring(stdout))
-    if metadata.get("Data"):
-      self.document.reload(metadata['Data'])
+    if 'document_url' in metadata:
+      self.document.reload(metadata['document_url'])
       metadata['Data'] = self.document.getContent()
+      del metadata['document_url']
     self.document.trash()
     return metadata
 

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=44737&r1=44736&r2=44737&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 17:35:39 2011
@@ -337,7 +337,7 @@ def main():
     output = encodestring(json.dumps(metadata_dict))
   elif '--getmetadata' in param_list and '--convert' in param_list:
     metadata_dict = unoconverter.getMetadata()
-    metadata_dict['Data'] = unoconverter.convert()
+    metadata_dict['document_url'] = unoconverter.convert()
     output = encodestring(json.dumps(metadata_dict))
   elif '--setmetadata' in param_list:
     unoconverter.setMetadata(metadata)