From: Mike Taylor <mike@indexdata.com>
Date: Tue, 12 Nov 2013 13:30:51 +0000 (+0000)
Subject: All use of config_default strucure is now inside a local block.
X-Git-Tag: 0.9.1~149^2~4
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;ds=sidebyside;h=a93069ae5cc34476d41d35e9089bc3535ae6fdaa;p=mkws-moved-to-github.git

All use of config_default strucure is now inside a local block.
So the code makes it clear that this is a temporary structure.
---

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index ea6bbdd..3ed38bb 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -98,40 +98,42 @@ mkws.debug_function = function (string) {
 }
 var debug = mkws.debug_function; // local alias
 
-/* default mkws config */
-/* ### No defaults given for:
- * lang, service_proxy_auth and of course the optional language_* entries.
- */
-var config_default = {
-    use_service_proxy: true,
-    sort_options: [["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]],
-    perpage_options: [10, 20, 30, 50],
-    sort_default: "relevance",
-    perpage_default: 20,
-    query_width: 50,
-    show_lang: true, 	/* show/hide language menu */
-    show_sort: true, 	/* show/hide sort menu */
-    show_perpage: true, 	/* show/hide perpage menu */
-    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_level: 1,     /* debug level for development: 0..2 */
-
-    dummy: "dummy"
-};
-
-/* 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 config_default) {
-    if (typeof mkws_config[k] === 'undefined')
-       mkws_config[k] = config_default[k];
-    debug("Set config: " + k + ' => ' + mkws_config[k]);
+{
+    /* default mkws config */
+    /* ### No defaults given for:
+     * lang, service_proxy_auth and of course the optional language_* entries.
+     */
+    var config_default = {
+	use_service_proxy: true,
+	sort_options: [["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]],
+	perpage_options: [10, 20, 30, 50],
+	sort_default: "relevance",
+	perpage_default: 20,
+	query_width: 50,
+	show_lang: true, 	/* show/hide language menu */
+	show_sort: true, 	/* show/hide sort menu */
+	show_perpage: true, 	/* show/hide perpage menu */
+	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_level: 1,     /* debug level for development: 0..2 */
+
+	dummy: "dummy"
+    };
+
+    /* 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 config_default) {
+	if (typeof mkws_config[k] === 'undefined')
+	   mkws_config[k] = config_default[k];
+	debug("Set config: " + k + ' => ' + mkws_config[k]);
+    }
 }
 
 if (mkws_config.query_width < 5 || mkws_config.query_width > 150) {