X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fmanifoldapi.py;h=81a2caf6ac6c2b2dccb5ca9bf57b515b010c27ae;hb=d68dcefd28c832608cdb359a07a8b871cbe612ae;hp=e482c2dc3eff73f7394d2edd4f93264aa3c47c01;hpb=40978b1456a978c7ea8e61ab9f72f368c7b9d53d;p=myslice.git

diff --git a/manifold/manifoldapi.py b/manifold/manifoldapi.py
index e482c2dc..81a2caf6 100644
--- a/manifold/manifoldapi.py
+++ b/manifold/manifoldapi.py
@@ -3,41 +3,76 @@ import xmlrpclib
 
 from myslice.config import Config
 
+from django.contrib import messages
+from manifoldresult import ManifoldResult, ManifoldCode, ManifoldException
+from manifold.core.result_value import ResultValue
+
+debug=False
 debug=True
 
 class ManifoldAPI:
 
-  def __init__(self, auth=None, cainfo=None):
-
-    config = Config()
-    self.auth = auth
-    self.cainfo = cainfo
-    self.errors = []
-    self.trace = []
-    self.calls = {}
-    self.multicall = False
-    self.url = config.manifold_url
-    self.server = xmlrpclib.Server(self.url, verbose=False, allow_none=True)
-
-  def __getattr__(self, methodName):
-      def func(*args, **kwds):
-        result=getattr(self.server, methodName)(self.auth, *args, **kwds)
-        ### debug
-        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 result
-      return func
-
-  def send_manifold_query (self, manifold_query):
-    (action,method)= (manifold_query.action,manifold_query.method)
-    if action=='get':
-      return self.server.Get(self.auth, method, manifold_query.filters, {}, manifold_query.fields)
-    # xxx...
+    def __init__(self, auth=None, cainfo=None):
+        
+        config = Config()
+        self.auth = auth
+        self.cainfo = cainfo
+        self.errors = []
+        self.trace = []
+        self.calls = {}
+        self.multicall = False
+        self.url = config.manifold_url
+        self.server = xmlrpclib.Server(self.url, verbose=False, allow_none=True)
+
+    def __repr__ (self): return "ManifoldAPI[%s]"%self.url
+
+    # a one-liner to give a hint of what the return value looks like
+    def _print_result (self, result):
+        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]"
+
+    # 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):
+            try:
+                if debug: print "====> ManifoldAPI.%s"%methodName,"auth",self.auth,"args",args,"kwds",kwds
+                result=getattr(self.server, methodName)(self.auth, *args, **kwds)
+                if debug:
+                    print '<==== backend call %s(*%s,**%s) returned'%(methodName,args,kwds),
+                    print '.ctd. Authmethod=',self.auth['AuthMethod'], self.url,'->',
+                    self._print_result(result)
+
+                return ResultValue(**result)
+
+            except Exception,error:
+                # XXX Connection refused for example
+                print "** API ERROR **"
+                import traceback
+                traceback.print_exc()
+                if debug: print "KO (unexpected exception)",error
+                raise ManifoldException ( ManifoldResult (code=ManifoldCode.UNKNOWN_ERROR, output="%s"%error) )
+
+        return func
+
+def execute_query(request, query):
+    if not 'manifold' in request.session:
+        print "W: Used hardcoded demo account for execute_query"
+        manifold_api_session_auth = {'AuthMethod': 'password', 'Username': 'demo', 'AuthString': 'demo'}
     else:
-      print "WARNING: ManifoldAPI.send_manifold_query: only 'get' implemented for now"
-    
+        manifold_api_session_auth = request.session['manifold']['auth']
+    manifold_api = ManifoldAPI(auth=manifold_api_session_auth)
+    print "-"*80
+    print query
+    print query.to_dict()
+    print "-"*80
+    result = manifold_api.forward(query.to_dict())
+    if result['code'] == 2:
+        raise Exception, 'Error running query'
+    return result['value']