X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fjs%2Fmanifold.js;h=5765195a24303a5ef06864fd03c55e978eff2bb8;hb=a0c7080d9eb960318465386d23b8da2b9f92d978;hp=3589d7eaed027700693e97245cdfd1fc83a99d98;hpb=45ea2e7ea4d6240f723cf743b9ad493ad70ceed2;p=unfold.git diff --git a/manifold/js/manifold.js b/manifold/js/manifold.js index 3589d7ea..5765195a 100644 --- a/manifold/js/manifold.js +++ b/manifold/js/manifold.js @@ -1,12 +1,21 @@ // utilities -function debug_dict (msg, o) { +function debug_dict_keys (msg, o) { var keys=[]; for (var k in o) keys.push(k); - console.log ("debug_dict: " + msg + " Keys : " + keys); + console.log ("debug_dict_keys: " + msg + " keys= " + keys); +} +function debug_dict (msg, o) { + for (var k in o) console.log ("debug_dict: " + msg + " [" + k + "]=" + o[k]); } function debug_value (msg, value) { console.log ("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 console.log ("debug_query: " + msg + " query= " + query); +} /* ------------------------------------------------------------ */ // this namespace holds functions for globally managing query objects @@ -45,10 +54,13 @@ var manifold = { // Loop through query array and use ajax to send back query_uuid_domids (to frontend) with json jQuery.each(query_uuid_domids, function(index, tuple) { var query=manifold.find_query(tuple.query_uuid); - var hash=query.to_hash(); - if (manifold.asynchroneous_debug) - console.log ("sending POST on " + manifold.proxy_url + " iterating on " + tuple.query_uuid + " -> " + hash); - jQuery.post(manifold.proxy_url, {'query': hash}, success_closure(query, tuple.id)); + var query_json=JSON.stringify (query); + if (manifold.asynchroneous_debug) { + console.log ("sending POST on " + manifold.proxy_url + " with query= " + query.__repr()); + } + // not quite sure what happens if we send a string directly, as POST data is named.. + // this gets reconstructed on the proxy side with ManifoldQuery.fill_from_POST + jQuery.post(manifold.proxy_url, {'json':query_json} , success_closure(query, tuple.id)); }) },