From f0dee854c76a1b065550eff5989abff77e87cb32 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 1 Oct 2013 14:31:18 +0200 Subject: [PATCH] shorter / more informative debug messages --- manifold/static/js/manifold-query.js | 2 +- manifold/static/js/manifold.js | 3 +-- portal/sliceview.py | 7 +++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/manifold/static/js/manifold-query.js b/manifold/static/js/manifold-query.js index 4da77da1..3116f84d 100644 --- a/manifold/static/js/manifold-query.js +++ b/manifold/static/js/manifold-query.js @@ -31,7 +31,7 @@ INSERT INTO object VALUES(field=value) this.__repr = function () { res = "ManifoldQuery "; - res += " id=" + this.query_uuid; +// res += " id=" + this.query_uuid; res += " a=" + this.action; res += " o=" + this.object; res += " ts=" + this.timestamp; diff --git a/manifold/static/js/manifold.js b/manifold/static/js/manifold.js index 726e68fd..791e4cfc 100644 --- a/manifold/static/js/manifold.js +++ b/manifold/static/js/manifold.js @@ -364,8 +364,7 @@ var manifold = { // by default we publish using the same uuid of course if (publish_uuid==undefined) publish_uuid=query.query_uuid; if (manifold.asynchroneous_debug) { - messages.debug("sending POST on " + manifold.proxy_url + " to be published on " + publish_uuid); - messages.debug("... ctd... with actual query= " + query.__repr()); + messages.debug("sending POST on " + manifold.proxy_url + query.__repr()); } query.iter_subqueries(function (sq) { diff --git a/portal/sliceview.py b/portal/sliceview.py index 175a40e6..74101f2c 100644 --- a/portal/sliceview.py +++ b/portal/sliceview.py @@ -21,6 +21,8 @@ from plugins.active_filters import ActiveFilters from plugins.quickfilter import QuickFilter from plugins.messages import Messages +from myslice.config import Config + tmp_default_slice='ple.upmc.myslicedemo' # temporary : turn off the users part to speed things up @@ -33,8 +35,9 @@ class SliceView (LoginRequiredAutoLogoutView): page = Page(request) page.add_css_files ('css/slice-view.css') page.add_js_files ( [ "js/common.functions.js" ] ) - page.add_js_chunks ('$(function() { console.log("sliceview: jQuery version " + $.fn.jquery); });') - page.add_js_chunks ('$(function() { console.log("sliceview: users turned %s"); });'%("on" if do_query_users else "off")) + page.add_js_chunks ('$(function() { messages.debug("sliceview: jQuery version " + $.fn.jquery); });') + page.add_js_chunks ('$(function() { messages.debug("sliceview: users turned %s"); });'%("on" if do_query_users else "off")) + page.add_js_chunks ('$(function() { messages.debug("manifold URL %s"); });'%(Config.manifold_url())) page.expose_js_metadata() metadata = page.get_metadata() -- 2.43.0