X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fmanifoldproxy.py;h=99e7b0aa7943faa670c9be942f40a943fcf97296;hb=d6bcc3a19ef4edb1b2a7efd436e02d39ab1ce329;hp=3ead6a3e12cf54412ba324d86a9af83865275f12;hpb=d0c1c4620fe021a2d54dec6c4519961dda867cce;p=myslice.git

diff --git a/manifold/manifoldproxy.py b/manifold/manifoldproxy.py
index 3ead6a3e..99e7b0aa 100644
--- a/manifold/manifoldproxy.py
+++ b/manifold/manifoldproxy.py
@@ -1,4 +1,6 @@
 import json
+import os.path
+
 # this is for django objects only
 #from django.core import serializers
 from django.http                import HttpResponse, HttpResponseForbidden
@@ -9,6 +11,7 @@ from manifold.core.result_value import ResultValue
 from manifold.manifoldapi       import ManifoldAPI
 from manifold.manifoldresult    import ManifoldException
 from manifold.util.log          import Log
+from myslice.config             import Config
 
 debug=False
 debug=True
@@ -22,11 +25,6 @@ debug_spin=0
 debug_empty=False
 #debug_empty=True
 
-# turn this on if you want the fastest possible (locally cached) feedback
-# beware that this is very rough though...
-work_offline=False
-#work_offline=True
-
 # this view is what the javascript talks to when it sends a query
 # see also
 # myslice/urls.py
@@ -53,13 +51,13 @@ 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)
         # 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') 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'}
+        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'):
+            admin_user, admin_password = Config().manifold_admin_user_password()
+            manifold_api_session_auth = {'AuthMethod': 'password', 'Username': admin_user, 'AuthString': admin_password}
         else:
             manifold_api_session_auth = request.session['manifold']['auth']
 
@@ -67,19 +65,6 @@ with the query passed using POST"""
             json_answer=json.dumps({'code':0,'value':[]})
             print "By-passing : debug_empty & 'get' request : returning a fake empty list"
             return HttpResponse (json_answer, mimetype="application/json")
-        ### patch : return the latest one..
-        if work_offline:
-            # if that won't work then we'll try to update anyways
-            try:
-                with (file(offline_filename,"r")) as f:
-                    json_answer=f.read()
-                print "By-passing : using contents from %s"%offline_filename
-                return HttpResponse (json_answer, mimetype="application/json")
-            except:
-                import traceback
-                traceback.print_exc()
-                print "Could not run in offline mode, PROCEEDING"
-                pass
                 
         # actually forward
         manifold_api= ManifoldAPI(auth=manifold_api_session_auth)
@@ -90,14 +75,11 @@ with the query passed using POST"""
         result = manifold_api.forward(manifold_query.to_dict())
 
         # XXX TEMP HACK
-        if 'description' in result and result['description'] and isinstance(result['description'], (tuple, list, set, frozenset)):
+        if 'description' in result and result['description'] \
+                and isinstance(result['description'], (tuple, list, set, frozenset)):
             result [ 'description' ] = [ ResultValue.to_html (x) for x in result['description'] ]
 
         json_answer=json.dumps(result)
-        # if in debug mode we save this so we can use offline mode later
-        if debug:
-            with (file(offline_filename,"w")) as f:
-                f.write(json_answer)
 
         # this is an artificial delay added for debugging purposes only
         if debug_spin>0: