[IMP] xmlrpc: reverted the common/db URI fusion, we prefer to keep the separate URI.
authorVo Minh Thu <vmt@openerp.com>
Tue, 27 Sep 2011 13:35:22 +0000 (15:35 +0200)
committerVo Minh Thu <vmt@openerp.com>
Tue, 27 Sep 2011 13:35:22 +0000 (15:35 +0200)
bzr revid: vmt@openerp.com-20110927133522-5qcngogolyw88vo7

openerp/wsgi.py

index 8db39a7..d88c2d2 100644 (file)
@@ -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).