X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fmanifoldproxy.py;h=f6ceb0efca5b1671eb6c24377629c9a01102e47c;hb=47fd4e2abb3c63765efec28fc9ea8b73264aa5af;hp=fd4c5ad96fbfba96a95d65ab21473e29ff28f6e3;hpb=f44c5a4320e96117a4f463114e8adb10372cfb9e;p=myslice.git

diff --git a/manifold/manifoldproxy.py b/manifold/manifoldproxy.py
index fd4c5ad9..f6ceb0ef 100644
--- a/manifold/manifoldproxy.py
+++ b/manifold/manifoldproxy.py
@@ -5,6 +5,7 @@ from django.http import HttpResponse, HttpResponseForbidden
 
 #from manifold.manifoldquery import ManifoldQuery
 from manifold.core.query import Query
+from manifold.core.result_value import ResultValue
 from manifold.manifoldapi import ManifoldAPI
 from manifold.manifoldresult import ManifoldException
 
@@ -84,35 +85,30 @@ with the query passed using POST"""
         if debug: print '===> manifoldproxy.proxy: sending to backend', manifold_query
         # for the benefit of the python code, manifoldAPI raises an exception if something is wrong
         # however in this case we want to propagate the complete manifold result to the js world
-        try:
-            answer=manifold_api.send_manifold_query (manifold_query)
-        except ManifoldException, manifold_result:
-            answer=manifold_result
-        print "="*80
-        print "ANSWER IN PROXY", answer
-        print answer.ok_value()
-        print "="*80
-        if debug: 
-            print '<=== manifoldproxy.proxy: received from backend with code', answer['code']
-            if answer['code']==0:
-                print ".... ctd ",
-                value=answer.ok_value()
-                if isinstance (value, list): print "result is a list with %d entries"%len(value)
-                elif isinstance (value, dict): print "result is a dict with keys %s"%value.keys()
-                else: print "result is other (type=%s) : %s"%(type(value),value)
-        json_answer=json.dumps(answer)
+
+
+        result = manifold_api.forward(manifold_query.to_dict())
+
+        # XXX TEMP HACK
+        if 'description' in result and result['description'] and isinstance(result['description'], (tuple, list, set, frozenset)):
+            result [ 'description' ] = [ ResultValue.to_html (x) for x in result['description'] ]
+
+        json_answer=json.dumps(result)
         # if in debug mode we save this so we can use offline mode later
         if debug:
             with (file(offline_filename,"w")) as f:
                 f.write(json_answer)
+
         # this is an artificial delay added for debugging purposes only
         if debug_spin>0:
             print "Adding additional artificial delay",debug_spin
             import time
             time.sleep(debug_spin)
+
         return HttpResponse (json_answer, mimetype="application/json")
 
     except:
+        print "** PROXY ERROR **"
         import traceback
         traceback.print_exc()