From 6d7f2989c7c03e201067982ffcd7b7cf7578164b Mon Sep 17 00:00:00 2001 From: Mike Taylor Date: Thu, 10 Oct 2013 17:08:26 +0100 Subject: [PATCH] 'debug' setting renamed 'debug_level' for clarity --- tools/htdocs/README.markdown | 2 +- tools/htdocs/mkws.js | 20 ++++++++++---------- tools/htdocs/whitepaper.markdown | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tools/htdocs/README.markdown b/tools/htdocs/README.markdown index 6e685e0..f702e43 100644 --- a/tools/htdocs/README.markdown +++ b/tools/htdocs/README.markdown @@ -71,7 +71,7 @@ possible options: query_width: 50, /* 5..50 */ perpage_default: 20, /* 10, 20, 30, 50 */ lang: "en", /* "en", "de", "da" */ - debug: 0, /* debug level for development: 0..2 */ + debug_level: 0, /* debug level for development: 0..2 */ responsive_design_wodth: 600, /* page reflows for devices < 600 pixels wide */ pazpar2_url: "/service-proxy/", /* URL */ diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js index b963fc3..74c723a 100644 --- a/tools/htdocs/mkws.js +++ b/tools/htdocs/mkws.js @@ -1,7 +1,7 @@ /* A very simple client that shows a basic usage of the pz2.js */ -"use strict"; // HTML5: disable for debug >= 2 +"use strict"; // HTML5: disable for debug_level >= 2 // Set up namespace and some state. var mkws = {}; @@ -85,7 +85,7 @@ mkws.debug_time = { "last": $.now() }; mkws.debug_function = function (string) { - if (!mkws.debug) + if (!mkws.debug_level) return; if (typeof console === "undefined" || typeof console.log === "undefined") { /* ARGH!!! old IE */ @@ -97,9 +97,9 @@ mkws.debug_function = function (string) { mkws.debug_time.last = now; // you need to disable use strict at the top of the file!!! - if (mkws.debug >= 3) { + if (mkws.debug_level >= 3) { console.log(timestamp + arguments.callee.caller); - } else if (mkws.debug >= 2) { + } else if (mkws.debug_level >= 2) { console.log(timestamp + ">>> called from function " + arguments.callee.caller.name + ' <<<'); } console.log(timestamp + string); @@ -573,16 +573,16 @@ function mkws_html_all(config) { lang_options: [], /* display languages links for given languages, [] for all */ facets: ["sources", "subjects", "authors"], /* display facets, in this order, [] for none */ responsive_design_width: undefined, /* a page with less pixel width considered as narrow */ - debug: 1, /* debug level for development: 0..2 */ + debug_level: 1, /* debug level for development: 0..2 */ dummy: "dummy" }; - /* set global debug flag early */ - if (typeof config.debug !== 'undefined') { - mkws.debug = config.debug; - } else if (typeof mkws_config_default.debug !== 'undefined') { - mkws.debug = mkws_config_default.debug; + /* set global debug_level flag early */ + if (typeof config.debug_level !== 'undefined') { + mkws.debug_level = config.debug_level; + } else if (typeof mkws_config_default.debug_level !== 'undefined') { + mkws.debug_level = mkws_config_default.debug_level; } /* override standard config values by function parameters */ diff --git a/tools/htdocs/whitepaper.markdown b/tools/htdocs/whitepaper.markdown index ea4b6c7..db9115b 100644 --- a/tools/htdocs/whitepaper.markdown +++ b/tools/htdocs/whitepaper.markdown @@ -277,7 +277,7 @@ long default values are in footnotes to keep the table reasonably narrow. --- Element Type Default Description -------- ----- --------- ------------ -debug int 1 Level of debugging output to emit. 0 = none, 1 = messages, 2 = messages with +debug_level int 1 Level of debugging output to emit. 0 = none, 1 = messages, 2 = messages with datestamps, 3 = messages with datestamps and stack-traces. facets array *Note 1* Ordered list of names of facets to display. Supported facet names are -- 1.7.10.4