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

diff --git a/manifold/manifoldproxy.py b/manifold/manifoldproxy.py
index 984531e9..9f014971 100644
--- a/manifold/manifoldproxy.py
+++ b/manifold/manifoldproxy.py
@@ -5,6 +5,7 @@ from django.http import HttpResponse, HttpResponseForbidden
 
 #from manifold.manifoldquery import ManifoldQuery
 from manifold.core.query import Query
+from manifold.core.result_value import ResultValue
 from manifold.manifoldapi import ManifoldAPI
 from manifold.manifoldresult import ManifoldException
 
@@ -55,7 +56,7 @@ with the query passed using POST"""
         # 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:
@@ -89,11 +90,8 @@ with the query passed using POST"""
         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 +107,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()