X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fmanifoldproxy.py;h=6eb67c3a3800adc05f61e47d9b214d994cd451f5;hb=fea9b7e286cc86f11844e371d67d184198afc287;hp=984531e9e8ce5c67f53ffa7816817e9f97780ed1;hpb=28994fa4ca7312850f9899adc67e71660a4a753d;p=myslice.git

diff --git a/manifold/manifoldproxy.py b/manifold/manifoldproxy.py
index 984531e9..6eb67c3a 100644
--- a/manifold/manifoldproxy.py
+++ b/manifold/manifoldproxy.py
@@ -1,12 +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.manifoldapi import ManifoldAPI
-from manifold.manifoldresult import ManifoldException
+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.util.log          import Log
 
 debug=False
 debug=True
@@ -51,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:
@@ -85,15 +89,11 @@ 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
-        import pprint
-        htmlLines = []
-        for textLine in pprint.pformat(result['description']).splitlines():
-            htmlLines.append('<br/>%s' % textLine) # or something even nicer
-        result['description'] = ('\n'.join(htmlLines)).replace(' ', '&nbsp;')
+        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
@@ -109,7 +109,8 @@ with the query passed using POST"""
 
         return HttpResponse (json_answer, mimetype="application/json")
 
-    except:
+    except Exception,e:
+        print "** PROXY ERROR **",e
         import traceback
         traceback.print_exc()