start to deal with xmlrpclib errors

[myslice.git] / manifold / manifoldproxy.py

diff --git a/manifold/manifoldproxy.py b/manifold/manifoldproxy.py
index eab783a..c444a37 100644 (file)
--- a/manifold/manifoldproxy.py
+++ b/manifold/manifoldproxy.py
@@ -4,7 +4,7 @@ import json
 from django.http import HttpResponse, HttpResponseForbidden
 
 from manifold.manifoldquery import ManifoldQuery
-from manifold.manifoldapi import ManifoldAPI
+from manifold.manifoldapi import ManifoldAPI, SessionExpired
 
 debug=False
 debug=True
@@ -43,7 +43,7 @@ with the query passed using POST"""
         if debug: print 'manifoldproxy.proxy: request.POST',request.POST
         manifold_query = ManifoldQuery()
         manifold_query.fill_from_POST(request.POST)
-        offline_filename="latest-%s-%s.json"%(manifold_query.action,manifold_query.subject)
+        offline_filename="offline-%s-%s.json"%(manifold_query.action,manifold_query.subject)
         # retrieve session for request
         manifold_api_session_auth = request.session['manifold']['auth']
         ### patch : return the latest one..
@@ -63,7 +63,14 @@ with the query passed using POST"""
         # actually forward
         manifold_api= ManifoldAPI(auth=manifold_api_session_auth)
         if debug: print 'manifoldproxy.proxy: sending to backend', manifold_query
-        answer=manifold_api.send_manifold_query (manifold_query)
+        # xxx we should embed the values inside a geni-like wrapper
+        try:
+            answer=manifold_api.send_manifold_query (manifold_query)
+            if debug: 
+                try:        print "received answer from backend with %d rows"%len(answer)
+                except:     print "received answer from backend - can't say len"
+        except SessionExpired,error:
+            answer=[ error.message ] 
         json_answer=json.dumps(answer)
         if (debug):
             with (file(offline_filename,"w")) as f:
@@ -71,8 +78,8 @@ with the query passed using POST"""
         if debug_spin:
             import time
             time.sleep(debug_spin)
-        # return json-encoded answer
         return HttpResponse (json_answer, mimetype="application/json")
+
     except:
         import traceback
         traceback.print_exc()