Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws

diff --git a/experiments/spclient/index.html b/experiments/spclient/index.html
index e043f55..4a485b4 100644 (file)
--- a/experiments/spclient/index.html
+++ b/experiments/spclient/index.html
@@ -10,7 +10,7 @@
     <script type="text/javascript">
        var mkws_config = { 
                lang: "da",
-               debug: 2,
+               debug: 1,
                use_service_proxy: true,
                switch_menu: true, 
                lang_menu: true, 

diff --git a/experiments/spclient/mkws.js b/experiments/spclient/mkws.js
index cad3ede..a7fb02a 100644 (file)
--- a/experiments/spclient/mkws.js
+++ b/experiments/spclient/mkws.js
@@ -3,17 +3,24 @@
 
 "use strict"; // HTML5: disable for debug >= 2
 
-// global config object mkws_config 
+/* 
+ * global config object: mkws_config 
+ * 
+ * needs to be defined in the HTML header before 
+ * including this JS file
+ */
+
 if (!mkws_config)
     var mkws_config = {}; // for the guys who forgot to define mkws_config...
 
+var mkws_debug = 1;
+
 var pazpar2_url = mkws_config.pazpar2_url ? mkws_config.pazpar2_url : "/pazpar2/search.pz2";
 var service_proxy_url = mkws_config.service_proxy_url ? mkws_config.service_proxy_url : "/service-proxy/";
 
 var pazpar2path = mkws_config.use_service_proxy ? service_proxy_url : pazpar2_url;
 var usesessions = mkws_config.use_service_proxy ? false : true;
 
-var mkws_debug = 1;
 
 var mkws_locale_lang = {
     "de": {
@@ -442,10 +449,10 @@ function renderDetails(data, marker)
  * All the HTML stuff to render the search forms and
  * result pages.
  */
-function mkws_html_all(data) {
+function mkws_html_all(config) {
 
-    /* default config */
-    var config = {
+    /* default mkws config */
+    var mkws_config_default = {
        sort: [["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]],
        perpage: [10, 20, 30, 50],
        sort_default: "relevance",
@@ -461,17 +468,19 @@ function mkws_html_all(data) {
     };
 
     /* set global debug flag early */
-    if (data.debug !== 'undefined') {
-       mkws_debug = data.debug;
-    } else if (config.debug !== 'undefined') {
+    if (config.debug !== 'undefined') {
        mkws_debug = config.debug;
+    } else if (mkws_config_default.debug !== 'undefined') {
+       mkws_debug = mkws_config_default.debug;
     }
     
     /* override standard config values by function parameters */
-    for (var k in data) {
-       config[k] = data[k];
-       debug("Set config: " + k + ' => ' + data[k]);
+    for (var k in mkws_config_default) {
+       if (typeof config[k] === 'undefined')
+          mkws_config[k] = mkws_config_default[k];
+       debug("Set config: " + k + ' => ' + mkws_config[k]);
     }
+
     if (mkws_config.query_width < 5 || mkws_config.query_width > 150) {
        debug("Reset query width: " + mkws_config.query_width);
        mkws_config.query_width = 50;
@@ -657,7 +666,7 @@ function mkws_html_lang(mkws_config) {
        if (lang == l) {
            data += l;
        } else {
-           data += ' <a href="/?lang=' + l + '">' + l + '</a> '
+           data += ' <a href="?lang=' + l + '">' + l + '</a> '
        }
     }
     
@@ -690,9 +699,8 @@ jQuery.extend({
 function debug(string) {
     if (!mkws_debug)
        return;
-   
-    var console; // IE8 quirks 
-    if (!console) { /* ARGH!!! */
+
+    if (typeof console === "undefined" || typeof console.log === "undefined") { /* ARGH!!! */
        return;
     }