X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=2f3db6531824e914c96dd83c720f4f2a76343983;hb=f7711bc36968bd87ede351dee9993cbbb47795f8;hp=d0206528152e4e8a841eec2a7e4005cc8c00a45a;hpb=73f873ace06068dd58647c833a005c762ba5c1b1;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index d020652..2f3db65 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -3,9 +3,6 @@
 
 "use strict"; // HTML5: disable for debug_level >= 2
 
-// Wrapper for jQuery
-(function ($) {
-
 // Set up namespace and some state.
 var mkws = {};
 
@@ -18,13 +15,8 @@ var mkws = {};
 if (!mkws_config)
     var mkws_config = {};
 
-if (typeof mkws_config.use_service_proxy === 'undefined')
-    mkws_config.use_service_proxy = true;
-
-var pazpar2_url = mkws_config.pazpar2_url || "http://mkws.indexdata.com/service-proxy/";
-
-mkws.pazpar2path = pazpar2_url;
-mkws.usesessions = mkws_config.use_service_proxy ? false : true;
+// Wrapper for jQuery
+(function ($) {
 
 mkws.locale_lang = {
     "de": {
@@ -83,6 +75,7 @@ mkws.debug_time = {
     "start": $.now(),
     "last": $.now()
 };
+
 mkws.debug_function = function (string) {
     if (!mkws.debug_level)
 	return;
@@ -105,40 +98,41 @@ mkws.debug_function = function (string) {
 }
 var debug = mkws.debug_function; // local alias
 
-/* default mkws config */
-/* ### No defaults given for:
- * lang, service_proxy_auth, use_service_proxy
- * and of course the optional language_* entries.
- */
-var config_default = {
-    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 */
+    var config_default = {
+	use_service_proxy: true,
+	service_proxy_auth: "http://mkws.indexdata.com/service-proxy-auth",
+	lang: "",
+	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) {
@@ -152,6 +146,7 @@ for (var key in mkws_config) {
 	    var lang = key.replace(/^language_/, "");
 	    // Copy custom languages into list
 	    mkws.locale_lang[lang] = mkws_config[key];
+	    debug("Added locally configured language '" + lang + "'");
 	}
     }
 }
@@ -162,13 +157,13 @@ for (var key in mkws_config) {
 // autoInit is set to true on default
 var my_paz = new pz2( { "onshow": my_onshow,
                     "showtime": 500,            //each timer (show, stat, term, bytarget) can be specified this way
-                    "pazpar2path": mkws.pazpar2path,
+                    "pazpar2path": mkws_config.pazpar2_url || "http://mkws.indexdata.com/service-proxy/",
                     "oninit": my_oninit,
                     "onstat": my_onstat,
                     "onterm": my_onterm,
                     "termlist": "xtargets,subject,author",
                     "onbytarget": my_onbytarget,
-	 	    "usesessions" : mkws.usesessions,
+	 	    "usesessions" : mkws_config.use_service_proxy ? false : true,
                     "showResponseType": '', // or "json" (for debugging?)
                     "onrecord": my_onrecord } );
 
@@ -236,9 +231,9 @@ function my_onstat(data) {
 
     stat.innerHTML = '<span class="head">Status info</span>' +
 	' -- ' +
-	'<span class="clients">' + data.activeclients + '/' + data.clients + '</span>' +
+	'<span class="clients">Active clients: ' + data.activeclients + '/' + data.clients + '</span>' +
 	' -- ' +
-        '<span class="records">' + data.records + '/' + data.hits + '</span>';
+        '<span class="records">Retrieved records: ' + data.records + '/' + data.hits + '</span>';
 }
 
 function my_onterm(data) {
@@ -679,7 +674,7 @@ function mkws_html_all() {
 }
 
 function mkws_set_lang()  {
-    var lang = $.parseQuerystring().lang || mkws_config.lang || "";
+    var lang = $.parseQuerystring().lang || mkws_config.lang;
     if (!lang || !mkws.locale_lang[lang]) {
 	mkws_config.lang = ""
     } else {
@@ -718,7 +713,7 @@ function mkws_html_sort() {
 	if (key == mkws_config.sort_default) {
 	    sort_html += ' selected="selected"';
 	}
-	sort_html += '>' + val + '</option>';
+	sort_html += '>' + M(val) + '</option>';
     }
     sort_html += '</select>';
 
@@ -749,9 +744,6 @@ function mkws_html_perpage() {
  * for the site.
  */
 function mkws_service_proxy_auth(auth_url) {
-    if (!auth_url)
-	auth_url = "http://mkws.indexdata.com/service-proxy-auth";
-
     debug("Run service proxy auth URL: " + auth_url);
 
     var request = new pzHttpRequest(auth_url, function(err) {
@@ -851,7 +843,7 @@ function M(word) {
     if (!lang || !mkws.locale_lang[lang])
 	return word;
 
-    return mkws.locale_lang[lang][word] ? mkws.locale_lang[lang][word] : word;
+    return mkws.locale_lang[lang][word] || word;
 }
 
 /*