X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fmanifoldapi.py;h=1826ba8490a4e1d7ab3dfec9dc43b902e3554306;hb=544e6ac78d490061f848f98adb0e08574b474371;hp=74aaf8c9da638e4c8c27120cdfa8e70cd50e2427;hpb=e3cb14806475d7b3ee256d8c711947126151cf3c;p=myslice.git

diff --git a/manifold/manifoldapi.py b/manifold/manifoldapi.py
index 74aaf8c9..1826ba84 100644
--- a/manifold/manifoldapi.py
+++ b/manifold/manifoldapi.py
@@ -38,33 +38,63 @@ class ManifoldAPI:
                 print "kwds",kwds
             try:
                 result=getattr(self.server, methodName)(self.auth, *args, **kwds)
-                if debug:
-                    print '===> backend call',methodName, self.auth, 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)
+                ### 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
+                    # XXX jordan : we need to wrap it into a ResultValue structure
+                    # XXX this is not good until we merge both repos
+                    if result['code'] != 2:
+                        return ManifoldResult(code=result['code'], value=result['result'])
+                    else:
+                        return 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]"
+                    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 anoanymous exception, we assume it's a problem with the session
+                # in some less unpolite way than this anonymous exception, we assume it's a problem with the session
                 # that needs to be refreshed
-                if debug: print "Session Expired"
                 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)
             except Exception,error:
                 print "ManifoldAPI: unexpected exception",error
-                return ManifoldResult (code=ManifoldResult.UNKNOWN_ERROR, output="%s"%error)
+                return ManifoldResult (code=ManifoldCode.UNKNOWN_ERROR, output="%s"%error)
         return func
 
-    def send_manifold_query (self, manifold_query):
-        (action,subject)= (manifold_query.action,manifold_query.subject)
-        if action=='get':
-            # use self.Get rather than self.server.Get so we catch exceptions as per __getattr__
-            return self.Get(subject, manifold_query.filters, {}, manifold_query.fields)
-        # xxx...
-        else:
-            print "WARNING: ManifoldAPI.send_manifold_query: only 'get' implemented for now"
+    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
+
+#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)