From 610eef07cd96c0fc26adf9887ae4566db20c066c Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Tue, 27 Sep 2011 15:35:22 +0200 Subject: [PATCH] [IMP] xmlrpc: reverted the common/db URI fusion, we prefer to keep the separate URI. bzr revid: vmt@openerp.com-20110927133522-5qcngogolyw88vo7 --- openerp/wsgi.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/openerp/wsgi.py b/openerp/wsgi.py index 8db39a780c7..d88c2d28ad3 100644 --- a/openerp/wsgi.py +++ b/openerp/wsgi.py @@ -116,19 +116,18 @@ def wsgi_xmlrpc(environ, start_response): service = path[0] if service == 'common': - if method in ('create_database', 'list', 'server_version'): - return xmlrpc_return(start_response, 'db', method, params) - else: - return xmlrpc_return(start_response, 'common', method, params) + if method in ('server_version',): + service = 'db' + return xmlrpc_return(start_response, service, method, params) + # A db segment must be given. elif len(path) == 2: service, db_name = path params = (db_name,) + params if service == 'model': - return xmlrpc_return(start_response, 'object', method, params) - elif service == 'report': - return xmlrpc_return(start_response, 'report', method, params) + service = 'object' + return xmlrpc_return(start_response, service, method, params) # TODO the body has been read, need to raise an exception (not return None).