git://git.onelab.eu
/
myslice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.onelab.eu/git/myslice
[myslice.git]
/
manifold
/
manifoldproxy.py
diff --git
a/manifold/manifoldproxy.py
b/manifold/manifoldproxy.py
index
720e564
..
6eb67c3
100644
(file)
--- a/
manifold/manifoldproxy.py
+++ b/
manifold/manifoldproxy.py
@@
-1,13
+1,16
@@
import json
import json
+import os.path
+
# this is for django objects only
#from django.core import serializers
# 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.manifoldquery import ManifoldQuery
-from manifold.core.query import Query
+from manifold.core.query
import Query
from manifold.core.result_value import ResultValue
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
debug=False
debug=True
@@
-52,7
+55,7
@@
with the query passed using POST"""
manifold_query = Query()
#manifold_query = ManifoldQuery()
manifold_query.fill_from_POST(request.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
# retrieve session for request
# We allow some requests to use the ADMIN user account
@@
-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
# 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
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")
return HttpResponse (json_answer, mimetype="application/json")
- except:
- print "** PROXY ERROR **"
+ except
Exception,e
:
+ print "** PROXY ERROR **"
,e
import traceback
traceback.print_exc()
import traceback
traceback.print_exc()