we embed the (currently raw) results from manifold API in a ManifoldResult dict

[myslice.git] / manifold / js / manifold.js

diff --git a/manifold/js/manifold.js b/manifold/js/manifold.js
index 5765195..449f735 100644 (file)
--- 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 */