Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan

[myslice.git] / manifold / manifoldproxy.py

diff --git a/manifold/manifoldproxy.py b/manifold/manifoldproxy.py
index eaa128b..99de784 100644 (file)
--- a/manifold/manifoldproxy.py
+++ b/manifold/manifoldproxy.py
@@ -3,8 +3,10 @@ import json
 #from django.core import serializers
 from django.http import HttpResponse, HttpResponseForbidden
 
-from manifold.manifoldquery import ManifoldQuery
+#from manifold.manifoldquery import ManifoldQuery
+from manifold.core.query import Query
 from manifold.manifoldapi import ManifoldAPI
+from manifold.manifoldresult import ManifoldException
 
 debug=False
 debug=True
@@ -46,9 +48,10 @@ with the query passed using POST"""
     try:
         # translate incoming POST request into a query object
         if debug: print 'manifoldproxy.proxy: request.POST',request.POST
-        manifold_query = ManifoldQuery()
+        manifold_query = Query()
+        #manifold_query = ManifoldQuery()
         manifold_query.fill_from_POST(request.POST)
-        offline_filename="offline-%s-%s.json"%(manifold_query.action,manifold_query.subject)
+        offline_filename="offline-%s-%s.json"%(manifold_query.action,manifold_query.object)
         # retrieve session for request
         manifold_api_session_auth = request.session['manifold']['auth']
         if debug_empty and manifold_query.action.lower()=='get':
@@ -71,8 +74,13 @@ 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
-        answer=manifold_api.send_manifold_query (manifold_query)
+        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()
@@ -87,7 +95,7 @@ with the query passed using POST"""
                 else: print "result is other (type=%s) : %s"%(type(value),value)
         json_answer=json.dumps(answer)
         # if in debug mode we save this so we can use offline mode later
-        if (debug):
+        if debug:
             with (file(offline_filename,"w")) as f:
                 f.write(json_answer)
         # this is an artificial delay added for debugging purposes only