Commit d24c9441 authored by Gabriel Monnerat's avatar Gabriel Monnerat

add uno_path and office_binary_path in kw. This attributes are passed to unoconverter.py script

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk/utils@38565 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent da35d619
...@@ -93,6 +93,10 @@ def application(global_config, **local_config): ...@@ -93,6 +93,10 @@ def application(global_config, **local_config):
openoffice.start() openoffice.start()
monitor.load(local_config) 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 to stop all processes
signal(SIGHUP, lambda x,y: stopProcesses()) signal(SIGHUP, lambda x,y: stopProcesses())
...@@ -100,10 +104,8 @@ def application(global_config, **local_config): ...@@ -100,10 +104,8 @@ def application(global_config, **local_config):
# Load all filters # Load all filters
openoffice.acquire() openoffice.acquire()
mimemapper.loadFilterList(application_hostname, mimemapper.loadFilterList(application_hostname,
openoffice_port) openoffice_port, **kw)
openoffice.release() openoffice.release()
from manager import Manager 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) cloudooo_manager = Manager(cloudooo_path_tmp_dir, **kw)
return WSGIXMLRPCApplication(instance=cloudooo_manager) return WSGIXMLRPCApplication(instance=cloudooo_manager)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment