X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fmanifoldapi.py;h=e7d6a1bc1836febdebab5e5ada458cd64c813dbb;hb=26d84333b968352f844b47740021dd2a2fcafa41;hp=14eef3bed707a7afec1dd68cbe836a85fe159fdb;hpb=d0ac1170425c64337c521b673b88d75425b8adba;p=myslice.git

diff --git a/manifold/manifoldapi.py b/manifold/manifoldapi.py
index 14eef3be..e7d6a1bc 100644
--- a/manifold/manifoldapi.py
+++ b/manifold/manifoldapi.py
@@ -3,7 +3,9 @@ import xmlrpclib
 
 from myslice.config import Config
 
+from django.contrib import messages
 from manifoldresult import ManifoldResult, ManifoldCode, ManifoldException
+from manifold.core.result_value import ResultValue
 
 debug=False
 debug=True
@@ -40,55 +42,42 @@ class ManifoldAPI:
     def __getattr__(self, methodName):
         def func(*args, **kwds):
             try:
-                if debug: print "====> ManifoldAPI.%s"%methodName,"args",args,"kwds",kwds
+                if debug: print "====> ManifoldAPI.%s"%methodName,"auth",self.auth,"args",args,"kwds",kwds
                 result=getattr(self.server, methodName)(self.auth, *args, **kwds)
                 if debug:
                     print '<==== backend call %s(*%s,**%s) returned'%(methodName,args,kwds),
                     print '.ctd. Authmethod=',self.auth['AuthMethod'], self.url,'->',
                     self._print_result(result)
-                ### attempt to cope with old APIs and new APIs
-                if isinstance (result, dict) and 'code' in result:
-                    if debug: print "taken as new API"
-                    # this sounds like a result from a new API
-                    # minimal treatment is required, but we do want to turn this into a 
-                    # class instance
-                    if result['code'] != 2: # in the manifold world, this can be either
-                                            # 0 (ok) 1 (partial result) or 2 which means error
-                        if debug: print "OK (new API)"
-                        return ManifoldResult(code=result['code'], value=result['value'])
-                    else:
-                        if debug: print "KO (new API) - raising ManifoldException"
-                        raise ManifoldException(ManifoldResult(code=result['code'], output=result['description']))
-                else:
-                    if debug: print "taken as old API"
-                    # we're talking to an old API
-                    # so if we make it here it should mean success
-                    return ManifoldResult (code=ManifoldCode.SUCCESS, value=result)
-            except xmlrpclib.Fault, error:
-                ### xxx this is very rough for now
-                # until we have some agreement about how the API calls should return error conditions
-                # in some less unpolite way than this anonymous exception, we assume it's a problem with the session
-                # that needs to be refreshed
-                if error.faultCode == 8002:
-                    if debug: print "KO (old API - 8002) - raising ManifoldException"
-                    reason="most likely your session has expired"
-                    reason += " (the manifold API has no unambiguous error reporting mechanism yet)"
-                    raise ManifoldException ( ManifoldResult (code=ManifoldCode.SESSION_EXPIRED, output=reason))
-                else:
-                    if debug: print "KO (old API - other) - raising ManifoldException"
-                    reason="xmlrpclib.Fault with faultCode = %s (not taken as session expired)"%error.faultCode
-                    raise ManifoldException ( ManifoldResult (code=ManifoldCode.UNKNOWN_ERROR, output=reason))
+
+                return ResultValue(**result)
+
             except Exception,error:
+                # XXX Connection refused for example
+                print "** API ERROR **"
+                import traceback
+                traceback.print_exc()
                 if debug: print "KO (unexpected exception)",error
                 raise ManifoldException ( ManifoldResult (code=ManifoldCode.UNKNOWN_ERROR, output="%s"%error) )
+
         return func
 
-    def send_manifold_query (self, query):
-        # We use a dictionary representation of the query for forwarding it to the API
-        ret = self.forward(query.to_dict())
-        if debug:
-            print "="*80
-            print "Result:"
-            print ret
-            print "="*80
-        return ret
+def execute_query(request, query):
+    if not 'manifold' in request.session:
+        print "W: Used hardcoded demo account for execute_query"
+        manifold_api_session_auth = {'AuthMethod': 'password', 'Username': 'demo', 'AuthString': 'demo'}
+    else:
+        manifold_api_session_auth = request.session['manifold']['auth']
+    manifold_api = ManifoldAPI(auth=manifold_api_session_auth)
+    print "-"*80
+    print query
+    print query.to_dict()
+    print "-"*80
+    result = manifold_api.forward(query.to_dict())
+    if result['code'] == 2:
+        raise Exception, 'Error running query: %r' % result
+
+    # XXX Handle errors
+    #Error running query: {'origin': [0, 'XMLRPCAPI'], 'code': 2, 'description': 'No such session: No row was found for one()', 'traceback': 'Traceback (most recent call last):\n  File "/usr/local/lib/python2.7/dist-packages/manifold/core/xmlrpc_api.py", line 68, in xmlrpc_forward\n    user = Auth(auth).check()\n  File "/usr/local/lib/python2.7/dist-packages/manifold/auth/__init__.py", line 245, in check\n    return self.auth_method.check()\n  File "/usr/local/lib/python2.7/dist-packages/manifold/auth/__init__.py", line 95, in check\n    raise AuthenticationFailure, "No such session: %s" % e\nAuthenticationFailure: No such session: No row was found for one()\n', 'type': 2, 'ts': None, 'value': None}
+
+
+    return result['value']