X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=engine%2Fmanifoldproxy.py;h=9f119dae9b7a4caf739be07b56af9b5ae2da19d3;hb=129d3dac66455410b60162594d8b3387ff4e0203;hp=109f59348189fbfb64c76210bf20161e9096fb60;hpb=97ec7c3d0976a4bf3425d756aa65f89071601c72;p=myslice.git diff --git a/engine/manifoldproxy.py b/engine/manifoldproxy.py index 109f5934..9f119dae 100644 --- a/engine/manifoldproxy.py +++ b/engine/manifoldproxy.py @@ -10,6 +10,7 @@ import json 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 @@ -23,17 +24,15 @@ def api (request,format): if format != 'json': print "manifoldproxy.api: unexpected format %s -- exiting"%format return - # xxx actually ask the backend here - # 4amine - # manifold_query = ManifoldQuery() - # manifold_query.fill_from_dict(request.POST) - # locate the api and/or the auth - # api= + 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=api.send_manifold_query (manifold_query) - hard_wired_answer = [ {'slice_hrn':'a.b.c'}, {'slice_hrn':'ple.inria.foo' } ] - answer=hard_wired_answer + answer=manifold_api.send_manifold_query (manifold_query) + #hard_wired_answer = [ {'slice_hrn':'a.b.c'}, {'slice_hrn':'ple.inria.foo' } ] + #answer=hard_wired_answer return HttpResponse (json.dumps(answer), mimetype="application/json") ####################