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

diff --git a/manifold/manifoldapi.py b/manifold/manifoldapi.py
index c1615c3e..c726c656 100644
--- a/manifold/manifoldapi.py
+++ b/manifold/manifoldapi.py
@@ -41,10 +41,11 @@ class ManifoldAPI:
                 ### 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
+                    return result # jordan
                 else:
                     if debug:
-                        print '===> backend call',methodName, self.auth, self.url,'->',
+                        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)
@@ -68,18 +69,27 @@ class ManifoldAPI:
         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
+
+#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)