X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fmanifoldproxy.py;h=6eb67c3a3800adc05f61e47d9b214d994cd451f5;hb=6fc8f34d4a718825ea7d083a470b1802b7ee9023;hp=f6ceb0efca5b1671eb6c24377629c9a01102e47c;hpb=4e348dd653e2f7124550f153a30744293eab3b2f;p=myslice.git

diff --git a/manifold/manifoldproxy.py b/manifold/manifoldproxy.py
index f6ceb0ef..6eb67c3a 100644
--- a/manifold/manifoldproxy.py
+++ b/manifold/manifoldproxy.py
@@ -1,13 +1,16 @@
 import json
+import os.path
+
 # this is for django objects only
 #from django.core import serializers
-from django.http import HttpResponse, HttpResponseForbidden
+from django.http                import HttpResponse, HttpResponseForbidden
 
 #from manifold.manifoldquery import ManifoldQuery
-from manifold.core.query import Query
+from manifold.core.query        import Query
 from manifold.core.result_value import ResultValue
-from manifold.manifoldapi import ManifoldAPI
-from manifold.manifoldresult import ManifoldException
+from manifold.manifoldapi       import ManifoldAPI
+from manifold.manifoldresult    import ManifoldException
+from manifold.util.log          import Log
 
 debug=False
 debug=True
@@ -52,11 +55,11 @@ with the query passed using POST"""
         manifold_query = Query()
         #manifold_query = ManifoldQuery()
         manifold_query.fill_from_POST(request.POST)
-        offline_filename="offline-%s-%s.json"%(manifold_query.action,manifold_query.object)
+        offline_filename="%s/../offline-%s-%s.json"%(os.path.dirname(__file__),manifold_query.action,manifold_query.object)
         # retrieve session for request
 
         # We allow some requests to use the ADMIN user account
-        if manifold_query.get_from() == 'local:user' and manifold_query.get_action() == 'create':
+        if (manifold_query.get_from() == 'local:user' and manifold_query.get_action() == 'create') or (manifold_query.get_from() == 'local:platform' and manifold_query.get_action() == 'get'):
             print "W: Used hardcoded demo account for admin queries"
             manifold_api_session_auth = {'AuthMethod': 'password', 'Username': 'demo', 'AuthString': 'demo'}
         else:
@@ -86,7 +89,6 @@ with the query passed using POST"""
         # 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
 
-
         result = manifold_api.forward(manifold_query.to_dict())
 
         # XXX TEMP HACK
@@ -107,8 +109,8 @@ with the query passed using POST"""
 
         return HttpResponse (json_answer, mimetype="application/json")
 
-    except:
-        print "** PROXY ERROR **"
+    except Exception,e:
+        print "** PROXY ERROR **",e
         import traceback
         traceback.print_exc()