X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fmanifoldproxy.py;h=d0a8a3ea84b40cdde9ac9dd365efdfd164951955;hb=b57d73b52870350b8150f00126394fd0df6d09f1;hp=05486cbaea8a1ffa182870e48cdfa3dbc538eca6;hpb=e6184193b74ac6d5c52289546dae9121bdd99008;p=myslice.git

diff --git a/manifold/manifoldproxy.py b/manifold/manifoldproxy.py
index 05486cba..d0a8a3ea 100644
--- a/manifold/manifoldproxy.py
+++ b/manifold/manifoldproxy.py
@@ -11,28 +11,16 @@ 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
+from myslice.configengine       import ConfigEngine
 
 debug=False
-debug=True
-
-# add artificial delay in s
-debug_spin=0
-#debug_spin=1
+#debug=True
 
 # pretend the server only returns - empty lists to 'get' requests - this is to mimick 
 # misconfigurations or expired credentials or similar corner case situations
 debug_empty=False
 #debug_empty=True
 
-# Historically we had a feature for developing without an Internet connection
-# However this won't work anymore as the python layer itself does manifold calls
-# before javascript has a chance to do so.
-# Might still come in handy 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
@@ -59,34 +47,21 @@ with the query passed using POST"""
         manifold_query = Query()
         #manifold_query = ManifoldQuery()
         manifold_query.fill_from_POST(request.POST)
-        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') \
                 or (manifold_query.get_from() == 'local:platform' and manifold_query.get_action() == 'get'):
-            admin_user, admin_password = Config().manifold_admin_user_password()
+            admin_user, admin_password = ConfigEngine().manifold_admin_user_password()
             manifold_api_session_auth = {'AuthMethod': 'password', 'Username': admin_user, 'AuthString': admin_password}
         else:
+            print request.session['manifold']
             manifold_api_session_auth = request.session['manifold']['auth']
 
         if debug_empty and manifold_query.action.lower()=='get':
             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)
@@ -102,16 +77,6 @@ with the query passed using POST"""
             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:
-            print "Adding additional artificial delay",debug_spin
-            import time
-            time.sleep(debug_spin)
 
         return HttpResponse (json_answer, mimetype="application/json")