[Erp5-report] r38565 gabriel - /erp5/trunk/utils/cloudooo/cloudooo/cloudooo.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Sep 22 22:22:03 CEST 2010
Author: gabriel
Date: Wed Sep 22 22:22:02 2010
New Revision: 38565
URL: http://svn.erp5.org?rev=38565&view=rev
Log:
add uno_path and office_binary_path in kw. This attributes are passed to unoconverter.py script
Modified:
erp5/trunk/utils/cloudooo/cloudooo/cloudooo.py
Modified: erp5/trunk/utils/cloudooo/cloudooo/cloudooo.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/cloudooo.py?rev=38565&r1=38564&r2=38565&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/cloudooo.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/cloudooo.py [utf8] Wed Sep 22 22:22:02 2010
@@ -93,6 +93,10 @@ def application(global_config, **local_c
openoffice.start()
monitor.load(local_config)
+ timeout_response = int(local_config.get('timeout_response'))
+ kw = dict(uno_path=local_config.get('uno_path'),
+ office_binary_path=local_config.get('office_binary_path'),
+ timeout=timeout_response)
# Signal to stop all processes
signal(SIGHUP, lambda x,y: stopProcesses())
@@ -100,10 +104,8 @@ def application(global_config, **local_c
# Load all filters
openoffice.acquire()
mimemapper.loadFilterList(application_hostname,
- openoffice_port)
+ openoffice_port, **kw)
openoffice.release()
from manager import Manager
- timeout_response = int(local_config.get('timeout_response'))
- kw = dict(timeout=timeout_response)
cloudooo_manager = Manager(cloudooo_path_tmp_dir, **kw)
return WSGIXMLRPCApplication(instance=cloudooo_manager)
More information about the Erp5-report
mailing list