implements sending update queries - and returns a sensible code for other query actions

[myslice.git] / manifold / manifoldapi.py

diff --git a/manifold/manifoldapi.py b/manifold/manifoldapi.py
index 6c942b4..86471ea 100644 (file)
--- a/manifold/manifoldapi.py
+++ b/manifold/manifoldapi.py
@@ -24,6 +24,12 @@ class ManifoldAPI:
 
     def __repr__ (self): return "ManifoldAPI[%s]"%self.url
 
+    # 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
+    # since most of the time we're getting this kind of issues for expired sessions
+    # (looks like sessions are rather short-lived), for now the choice is to map these errors on 
+    # a SESSION_EXPIRED code
     def __getattr__(self, methodName):
         def func(*args, **kwds):
             if (debug): 
@@ -54,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)