[Erp5-report] r45086 gabriel - /erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Apr 5 14:34:37 CEST 2011
Author: gabriel
Date: Tue Apr 5 14:34:36 2011
New Revision: 45086
URL: http://svn.erp5.org?rev=45086&view=rev
Log:
lock openoffice before the conversion only
Modified:
erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/handler.py
Modified: erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/handler.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/handler.py?rev=45086&r1=45085&r2=45086&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/handler.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/handler.py [utf8] Tue Apr 5 14:34:36 2011
@@ -155,13 +155,13 @@ class Handler(object):
destination_format -- extension of document as String
"""
logger.debug("Convert: %s > %s" % (self.source_format, destination_format))
- openoffice.acquire()
kw['source_format'] = self.source_format
if destination_format:
kw['destination_format'] = destination_format
kw['mimemapper'] = self._serializeMimemapper(self.source_format,
destination_format)
kw['refresh'] = json.dumps(self.refresh)
+ openoffice.acquire()
try:
stdout, stderr = self._callUnoConverter(*['convert'], **kw)
finally:
@@ -177,13 +177,13 @@ class Handler(object):
Keywords Arguments:
base_document -- Boolean variable. if true, the document is also returned
along with the metadata."""
- openoffice.acquire()
logger.debug("getMetadata")
kw = dict(mimemapper=self._serializeMimemapper())
if base_document:
feature_list = ['getmetadata', 'convert']
else:
feature_list = ['getmetadata']
+ openoffice.acquire()
try:
stdout, stderr = self._callUnoConverter(*feature_list, **kw)
finally:
@@ -201,10 +201,10 @@ class Handler(object):
Keyword arguments:
metadata -- expected an dictionary with metadata.
"""
- openoffice.acquire()
metadata_pickled = json.dumps(metadata)
logger.debug("setMetadata")
kw = dict(metadata=encodestring(metadata_pickled))
+ openoffice.acquire()
try:
stdout, stderr = self._callUnoConverter(*['setmetadata'], **kw)
finally:
More information about the Erp5-report
mailing list