Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Mon, 11 Mar 2013 08:27:12 +0000 (09:27 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Mon, 11 Mar 2013 08:27:12 +0000 (09:27 +0100)
1  2 
engine/manifoldapi.py

diff --combined engine/manifoldapi.py
@@@ -25,17 -25,15 +25,15 @@@ class ManifoldAPI
    def __getattr__(self, methodName):
        def func(*args, **kwds):
          result=getattr(self.proxy, methodName)(self.auth, *args, **kwds)
 -        if debug: print methodName, self.auth, self.url,'->',result
 +        if debug: print '===> backend call',methodName, self.auth, self.url,'->',result
          return result
        return func
  
    # 4amine : xxx
    def send_manifold_query (self, manifold_query):
-     (action,method)= (raw_query.action,raw_query.method)
+     (action,method)= (manifold_query.action,manifold_query.method)
      if action=='get':
-       return self.Get(method,
-                       # need to fill in the other args here
-                       )
+       return self.proxy.Get(self.auth, method, manifold_query.filters, {}, manifold_query.fields)
      # xxx...
      elif action=='others':
        return None