X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fmanifoldapi.py;h=14eef3bed707a7afec1dd68cbe836a85fe159fdb;hb=014edeca57deed3141dda9056949e537f55fdf25;hp=c9d3b0b137ae7ad5e0619dbddd5cb5fee70770b1;hpb=6f7396c98fb300a7f4309ba42a6cfc7581a3a77d;p=myslice.git

diff --git a/manifold/manifoldapi.py b/manifold/manifoldapi.py
index c9d3b0b1..14eef3be 100644
--- a/manifold/manifoldapi.py
+++ b/manifold/manifoldapi.py
@@ -3,7 +3,7 @@ import xmlrpclib
 
 from myslice.config import Config
 
-from manifoldresult import ManifoldResult, ManifoldCode
+from manifoldresult import ManifoldResult, ManifoldCode, ManifoldException
 
 debug=False
 debug=True
@@ -24,6 +24,13 @@ class ManifoldAPI:
 
     def __repr__ (self): return "ManifoldAPI[%s]"%self.url
 
+    # a one-liner to give a hint of what the return value looks like
+    def _print_result (self, result):
+        if not result:                        print "[no/empty result]"
+        elif isinstance (result,str):         print "result is '%s'"%result
+        elif isinstance (result,list):        print "result is a %d-elts list"%len(result)
+        else:                                 print "[dont know how to display result]"
+
     # xxx temporary code for scaffolding a ManifolResult on top of an API that does not expose error info
     # as of march 2013 we work with an API that essentially either returns the value, or raises 
     # an xmlrpclib.Fault exception with always the same 8002 code
@@ -32,24 +39,30 @@ class ManifoldAPI:
     # a SESSION_EXPIRED code
     def __getattr__(self, methodName):
         def func(*args, **kwds):
-            if (debug): 
-                print "entering ManifoldAPI.%s"%methodName,
-                print "args",args,
-                print "kwds",kwds
             try:
+                if debug: print "====> ManifoldAPI.%s"%methodName,"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:
-                    # this sounds like a result from a new API, leave it untouched
-                    pass
+                    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 '===> backend call', methodName, args, kwds
-                        print '.... ctd', 'Authmethod=',self.auth['AuthMethod'], self.url,'->',
-                        if not result:                        print "[no/empty result]"
-                        elif isinstance (result,str):         print "result is '%s'"%result
-                        elif isinstance (result,list):        print "result is a %d-elts list"%len(result)
-                        else:                                 print "[dont know how to display result]"
+                    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
@@ -57,30 +70,25 @@ class ManifoldAPI:
                 # 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)"
-                    return ManifoldResult (code=ManifoldCode.SESSION_EXPIRED, output=reason)
+                    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
-                    return ManifoldResult (code=ManifoldCode.UNKNOWN_ERROR, output=reason)
+                    raise ManifoldException ( ManifoldResult (code=ManifoldCode.UNKNOWN_ERROR, output=reason))
             except Exception,error:
-                print "ManifoldAPI: unexpected exception",error
-                return ManifoldResult (code=ManifoldCode.UNKNOWN_ERROR, output="%s"%error)
+                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):
-        (action,subject)= (query.action,query.subject)
-        # use e.g. self.Get rather than self.server.Get so we use the __getattr__ code
-        if action=='get':
-# this makes the backend to squeak and one can't login anymore...
-#            return self.Get(subject, query.filters, query.timestamp, query.fields)
-            return self.Get(subject, query.filters, {}, query.fields)
-        elif action=='update':
-            answer=self.Update(subject, query.filters, query.params, query.fields)
-            if not isinstance (answer, ManifoldResult): print "UNEXECPECTED answer", answer
-            return answer
-        else:
-            warning="WARNING: ManifoldAPI.send_manifold_query: %s not implemented for now"%action
-            print warning
-            print 3
-            return ManifoldResult(code=ManifoldCode.NOT_IMPLEMENTED, output=warning)
+        # 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