X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fmanifoldapi.py;h=9361b6eb7e304e0764ab08a5acacc11dd2879df2;hb=c0c7175e6883ad9bc746692e7c71202e64ec2351;hp=c726c656f9455472d67a596327a7a8bee4848b81;hpb=5f74cb3f960c342b56f91d772061900ac48528ea;p=myslice.git

diff --git a/manifold/manifoldapi.py b/manifold/manifoldapi.py
index c726c656..9361b6eb 100644
--- a/manifold/manifoldapi.py
+++ b/manifold/manifoldapi.py
@@ -3,7 +3,9 @@ import xmlrpclib
 
 from myslice.config import Config
 
-from manifoldresult import ManifoldResult, ManifoldCode
+from django.contrib import messages
+from manifoldresult import ManifoldResult, ManifoldCode, ManifoldException
+from manifold.core.result_value import ResultValue
 
 debug=False
 debug=True
@@ -24,6 +26,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,64 +41,23 @@ 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,"auth",self.auth,"args",args,"kwds",kwds
                 result=getattr(self.server, methodName)(self.auth, *args, **kwds)
-                ### 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
-                    return result # jordan
-                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]"
-                    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:
-                    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)
-                else:
-                    reason="xmlrpclib.Fault with faultCode = %s (not taken as session expired)"%error.faultCode
-                    return ManifoldResult (code=ManifoldCode.UNKNOWN_ERROR, output=reason)
+                if debug:
+                    print '<==== backend call %s(*%s,**%s) returned'%(methodName,args,kwds),
+                    print '.ctd. Authmethod=',self.auth['AuthMethod'], self.url,'->',
+                    self._print_result(result)
+
+                return ResultValue(**result)
+
             except Exception,error:
-                print "ManifoldAPI: unexpected exception",error
-                return ManifoldResult (code=ManifoldCode.UNKNOWN_ERROR, output="%s"%error)
-        return func
+                # 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) )
 
-    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
+        return func
 
-#old#        (action,subject)= (query.action,query.subject)
-#old#        # use e.g. self.Get rather than self.server.Get so we use the __getattr__ code
-#old#        if action=='get':
-#old## this makes the backend to squeak and one can't login anymore...
-#old##            return self.Get(subject, query.filters, query.timestamp, query.fields)
-#old#            return self.Get(subject, query.filters, {}, query.fields)
-#old#        elif action=='update':
-#old#            answer=self.Update(subject, query.filters, query.params, query.fields)
-#old#            if not isinstance (answer, ManifoldResult): print "UNEXECPECTED answer", answer
-#old#            return answer
-#old#        else:
-#old#            warning="WARNING: ManifoldAPI.send_manifold_query: %s not implemented for now"%action
-#old#            print warning
-#old#            print 3
-#old#            return ManifoldResult(code=ManifoldCode.NOT_IMPLEMENTED, output=warning)