X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=manifold%2Fmanifoldapi.py;h=86471eab3d42bb822c3147a5bf62c381a43807f6;hb=fe88de0f7a2d45176733e22f49b5b5686dd5ec17;hp=74aaf8c9da638e4c8c27120cdfa8e70cd50e2427;hpb=63660d176dff8a3e2b5195d34a63948891138c47;p=myslice.git diff --git a/manifold/manifoldapi.py b/manifold/manifoldapi.py index 74aaf8c9..86471eab 100644 --- a/manifold/manifoldapi.py +++ b/manifold/manifoldapi.py @@ -60,11 +60,14 @@ class ManifoldAPI: return ManifoldResult (code=ManifoldResult.UNKNOWN_ERROR, output="%s"%error) return func - def send_manifold_query (self, manifold_query): - (action,subject)= (manifold_query.action,manifold_query.subject) + def send_manifold_query (self, query): + (action,subject)= (query.action,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... + return self.Get(subject, query.filters, query.timestamp, query.fields) + if action=='update': + return self.Update(subject, query.filters, query.params, query.fields) else: - print "WARNING: ManifoldAPI.send_manifold_query: only 'get' implemented for now" + warning="WARNING: ManifoldAPI.send_manifold_query: %s not implemented for now"%action + print warning + return ManifoldResult(code=ManifoldCode.NOT_IMPLEMENTED, output=warning)