X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fmanifoldapi.py;h=2524727015b4146284d5503cfd2681e2966d8543;hb=a8a54f34297f76d9379070f0fd2c1bec9f761c47;hp=eaf92668ad5bf436be88f967b5f2a9324d66b517;hpb=28994fa4ca7312850f9899adc67e71660a4a753d;p=myslice.git

diff --git a/manifold/manifoldapi.py b/manifold/manifoldapi.py
index eaf92668..25247270 100644
--- a/manifold/manifoldapi.py
+++ b/manifold/manifoldapi.py
@@ -31,7 +31,11 @@ class ManifoldAPI:
         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]"
+        elif isinstance (result,dict):        
+            print "result is a dict with %d keys : %s"%(len(result),result.keys())
+            for (k,v) in result.iteritems(): print '...',k,':',v
+            print "result is a dict with %d keys : %s"%(len(result),result.keys()),
+        else:                                 print "[dont know how to display result] %s"%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 
@@ -52,8 +56,32 @@ class ManifoldAPI:
                 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 or not 'auth' in request.session['manifold']:
+        print "W: Used hardcoded demo account for execute_query"
+        manifold_api_session_auth = {'AuthMethod': 'password', 'Username': 'demo', 'AuthString': 'demo'}
+    else:
+        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: %r' % result
+
+    # XXX Handle errors
+    #Error running query: {'origin': [0, 'XMLRPCAPI'], 'code': 2, 'description': 'No such session: No row was found for one()', 'traceback': 'Traceback (most recent call last):\n  File "/usr/local/lib/python2.7/dist-packages/manifold/core/xmlrpc_api.py", line 68, in xmlrpc_forward\n    user = Auth(auth).check()\n  File "/usr/local/lib/python2.7/dist-packages/manifold/auth/__init__.py", line 245, in check\n    return self.auth_method.check()\n  File "/usr/local/lib/python2.7/dist-packages/manifold/auth/__init__.py", line 95, in check\n    raise AuthenticationFailure, "No such session: %s" % e\nAuthenticationFailure: No such session: No row was found for one()\n', 'type': 2, 'ts': None, 'value': None}
+
+
+    return result['value']