clean up

[unfold.git] / engine / manifoldproxy.py

diff --git a/engine/manifoldproxy.py b/engine/manifoldproxy.py
index 52c747f..a66f187 100644 (file)
--- a/engine/manifoldproxy.py
+++ b/engine/manifoldproxy.py
@@ -9,6 +9,9 @@ import json
 #from django.core import serializers
 from django.http import HttpResponse, HttpResponseForbidden
 
+from engine.manifoldquery import ManifoldQuery
+from engine.manifoldapi import ManifoldAPI
+
 # xxx should probably cater for
 # format_in : how is the query encoded in POST
 # format_out: how to serve the results
@@ -21,10 +24,13 @@ def api (request,format):
     if format != 'json':
         print "manifoldproxy.api: unexpected format %s -- exiting"%format
         return
-
     # xxx actually ask the backend here
-    hard_wired_answer = [ {'slice_hrn':'a.b.c'}, {'slice_hrn':'ple.inria.foo' } ]
-    answer=hard_wired_answer
+    manifold_query = ManifoldQuery()
+    manifold_query.fill_from_dict(request.POST)
+    manifold_api_session_auth = request.session['manifold']['auth']
+    manifold_api= ManifoldAPI(auth=manifold_api_session_auth)
+    # forward
+    answer=manifold_api.send_manifold_query (manifold_query)
     return HttpResponse (json.dumps(answer), mimetype="application/json")
 
 ####################