various fixes

[myslice.git] / manifold / manifoldproxy.py

diff --git a/manifold/manifoldproxy.py b/manifold/manifoldproxy.py
index 29239b5..1182955 100644 (file)
--- a/manifold/manifoldproxy.py
+++ b/manifold/manifoldproxy.py
@@ -3,7 +3,8 @@ 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
 
 debug=False
@@ -46,9 +47,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':
@@ -75,12 +77,13 @@ with the query passed using POST"""
         answer=manifold_api.send_manifold_query (manifold_query)
         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['result'] # was: value
+                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)