we embed the (currently raw) results from manifold API in a ManifoldResult dict

[myslice.git] / manifold / manifoldproxy.py

diff --git a/manifold/manifoldproxy.py b/manifold/manifoldproxy.py
index c444a37..d0636c8 100644 (file)
--- a/manifold/manifoldproxy.py
+++ b/manifold/manifoldproxy.py
@@ -4,7 +4,7 @@ import json
 from django.http import HttpResponse, HttpResponseForbidden
 
 from manifold.manifoldquery import ManifoldQuery
-from manifold.manifoldapi import ManifoldAPI, SessionExpired
+from manifold.manifoldapi import ManifoldAPI
 
 debug=False
 debug=True
@@ -63,14 +63,8 @@ with the query passed using POST"""
         # actually forward
         manifold_api= ManifoldAPI(auth=manifold_api_session_auth)
         if debug: print 'manifoldproxy.proxy: sending to backend', manifold_query
-        # xxx we should embed the values inside a geni-like wrapper
-        try:
-            answer=manifold_api.send_manifold_query (manifold_query)
-            if debug: 
-                try:        print "received answer from backend with %d rows"%len(answer)
-                except:     print "received answer from backend - can't say len"
-        except SessionExpired,error:
-            answer=[ error.message ] 
+        answer=manifold_api.send_manifold_query (manifold_query)
+        if debug: print 'manifoldproxy.proxy: received from backend with code', answer['code']
         json_answer=json.dumps(answer)
         if (debug):
             with (file(offline_filename,"w")) as f: