X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fjs%2Fmanifold.js;h=449f735fe4b0ce880d8bd8cdcda5e035716591f6;hb=57c5bcefb1eac66d1db27db28a0c6d3b3b52a407;hp=5765195a24303a5ef06864fd03c55e978eff2bb8;hpb=a0c7080d9eb960318465386d23b8da2b9f92d978;p=myslice.git

diff --git a/manifold/js/manifold.js b/manifold/js/manifold.js
index 5765195a..449f735f 100644
--- a/manifold/js/manifold.js
+++ b/manifold/js/manifold.js
@@ -13,7 +13,7 @@ function debug_value (msg, value) {
 function debug_query (msg, query) {
     if (query === undefined) console.log ("debug_query: " + msg + " -> undefined");
     else if (query == null) console.log ("debug_query: " + msg + " -> null");
-    else if ('query_uuid' in query) console.log ("debug_query: " + msg + " query_uuid= " + query.query_uuid);
+    else if ('query_uuid' in query) console.log ("debug_query: " + msg + query.__repr());
     else console.log ("debug_query: " + msg + " query= " + query);
 }
 
@@ -38,13 +38,15 @@ var manifold = {
     // trigger a query asynchroneously
     proxy_url : '/manifold/proxy/json/',
 
-    asynchroneous_debug : true,
+    asynchroneous_debug : false,
 
     // Executes all async. queries
     // input queries are specified as a list of {'query_uuid': <query_uuid>, 'id': <possibly null>}
     asynchroneous_exec : function (query_uuid_domids) {
 	// start spinners
-	jQuery('.need-spin').spin();
+
+	if (manifold.asynchroneous_debug) console.log("Turning on spin with " + jQuery(".need-spin").length + " matches for .need-spin");
+	jQuery('.need-spin').spin(spin_presets);
 	
 	// We use js function closure to be able to pass the query (array) to the
 	// callback function used when data is received
@@ -65,6 +67,17 @@ var manifold = {
 	    },
 
     asynchroneous_success : function (data, query, id) {
+	if (manifold.asynchroneous_debug) console.log ("received manifold result with code " + data.code);
+	// xxx should have a nicer declaration of that enum in sync with the python code somehow
+	if (data.code == 1) {
+	    alert("Your session has expired, please log in again");
+	    window.location="/logout/";
+	    return;
+	} elif (data.code != 0) {
+	    alert("Error received from manifold backend at " + MANIFOLD_URL + " [" + data.output + "]");
+	    return;
+	}
+	data=data.value;
 	if (data) {
             if (!!id) {
 		/* Directly inform the requestor */