X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=0cad5190cc152b2fe207926dcfe61d7cbdabfc24;hb=980b18b55feef84bd8a83fb9d02b5b6e45472353;hp=b963fc3d8dee66ac64eb97ec6d64021c3a426af4;hpb=7bacf6035b0c696b54d4d16075942ecea65c2d38;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index b963fc3..0cad519 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);
@@ -554,14 +554,14 @@ function renderField(caption, data, data2, data3) {
  * All the HTML stuff to render the search forms and
  * result pages.
  */
-function mkws_html_all(config) {
+function mkws_html_all() {
 
     /* default mkws config */
     /* ### No defaults given for:
      * lang, service_proxy_auth, use_service_proxy
      * and of course the optional language_* entries.
      */
-    var mkws_config_default = {
+    var config_default = {
 	sort_options: [["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]],
 	perpage_options: [10, 20, 30, 50],
 	sort_default: "relevance",
@@ -573,22 +573,22 @@ 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 mkws_config.debug_level !== 'undefined') {
+	mkws.debug_level = mkws_config.debug_level;
+    } else if (typeof config_default.debug_level !== 'undefined') {
+	mkws.debug_level = config_default.debug_level;
     }
 
     /* override standard config values by function parameters */
-    for (var k in mkws_config_default) {
-	if (typeof config[k] === 'undefined')
-	   mkws_config[k] = mkws_config_default[k];
+    for (var k in config_default) {
+	if (typeof mkws_config[k] === 'undefined')
+	   mkws_config[k] = config_default[k];
 	debug("Set config: " + k + ' => ' + mkws_config[k]);
     }
 
@@ -597,9 +597,9 @@ function mkws_html_all(config) {
 	mkws_config.query_width = 50;
     }
 
-    mkws_set_lang(mkws_config);
+    mkws_set_lang();
     if (mkws_config.show_lang)
-	mkws_html_lang(mkws_config);
+	mkws_html_lang();
 
     // For some reason, doing this programmatically results in
     // document.mkwsSearchForm.mkwsQuery being undefined, hence the raw HTML.
@@ -644,21 +644,21 @@ function mkws_html_all(config) {
     if ($("#mkwsRanking").length) {
 	var ranking_data = '';
 	ranking_data += '<form name="mkwsSelect" id="mkwsSelect" action="" >';
-	if (config.show_sort) {
-	    ranking_data +=  M('Sort by') + ' ' + mkws_html_sort(config) + ' ';
+	if (mkws_config.show_sort) {
+	    ranking_data +=  M('Sort by') + ' ' + mkws_html_sort() + ' ';
 	}
-	if (config.show_perpage) {
-	    ranking_data += M('and show') + ' ' + mkws_html_perpage(config) + ' ' + M('per page') + '.';
+	if (mkws_config.show_perpage) {
+	    ranking_data += M('and show') + ' ' + mkws_html_perpage(mkws_config) + ' ' + M('per page') + '.';
 	}
         ranking_data += '</form>';
 
 	$("#mkwsRanking").html(ranking_data);
     }
 
-    mkws_html_switch(config);
+    mkws_html_switch(mkws_config);
 
     if (mkws_config.use_service_proxy)
-	mkws_service_proxy_auth(config.service_proxy_auth);
+	mkws_service_proxy_auth(mkws_config.service_proxy_auth);
 
     if (mkws_config.responsive_design_width) {
 	// Responsive web design - change layout on the fly based on
@@ -681,7 +681,7 @@ function mkws_html_all(config) {
     }
 }
 
-function mkws_set_lang(mkws_config)  {
+function mkws_set_lang()  {
     var lang = $.parseQuerystring().lang || mkws_config.lang || "";
     if (!lang || !mkws.locale_lang[lang]) {
 	mkws_config.lang = ""
@@ -708,16 +708,16 @@ function mkws_html_switch(config) {
     $("#mkwsTargets").css("display", "none");
 }
 
-function mkws_html_sort(config) {
+function mkws_html_sort() {
     debug("HTML sort");
     var sort_html = '<select name="mkwsSort" id="mkwsSort">';
 
-    for(var i = 0; i < config.sort_options.length; i++) {
-	var key = config.sort_options[i][0];
-	var val = config.sort_options[i].length == 1 ? config.sort_options[i][0] : config.sort_options[i][1];
+    for(var i = 0; i < mkws_config.sort_options.length; i++) {
+	var key = mkws_config.sort_options[i][0];
+	var val = mkws_config.sort_options[i].length == 1 ? mkws_config.sort_options[i][0] : mkws_config.sort_options[i][1];
 
 	sort_html += '<option value="' + key + '"';
-	if (key == config.sort_default) {
+	if (key == mkws_config.sort_default) {
 	    sort_html += ' selected="selected"';
 	}
 	sort_html += '>' + val + '</option>';
@@ -778,7 +778,7 @@ function mkws_service_proxy_auth(auth_url) {
 }
 
 /* create locale language menu */
-function mkws_html_lang(mkws_config) {
+function mkws_html_lang() {
     var lang_default = "en";
     var lang = mkws_config.lang || lang_default;
     var list = [];
@@ -1004,7 +1004,7 @@ function init_popup(obj) {
 /* magic */
 $(document).ready(function() {
     try {
-	mkws_html_all(mkws_config)
+	mkws_html_all()
     }
 
     catch (e) {