X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=4f4cc5cc94cec3a0034dbb92b4d2f77b7ad7bf06;hb=fbe408c72c6c4211e329ddab3b54a42034efc0f4;hp=3ed38bb3077d08bba57842eb51448717e9f964d8;hpb=a93069ae5cc34476d41d35e9089bc3535ae6fdaa;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 3ed38bb..4f4cc5c 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,6 +15,9 @@ var mkws = {};
 if (!mkws_config)
     var mkws_config = {};
 
+// Wrapper for jQuery
+(function ($) {
+
 mkws.locale_lang = {
     "de": {
 	"Authors": "Autoren",
@@ -100,11 +100,10 @@ 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,
+	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",
@@ -147,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 + "'");
 	}
     }
 }
@@ -229,11 +229,11 @@ function my_onstat(data) {
     if (stat == null)
 	return;
 
-    stat.innerHTML = '<span class="head">Status info</span>' +
+    stat.innerHTML = '<span class="head">' + M('Status info') + '</span>' +
 	' -- ' +
-	'<span class="clients">' + data.activeclients + '/' + data.clients + '</span>' +
+	'<span class="clients">' + M('Active clients') + ': ' + data.activeclients + '/' + data.clients + '</span>' +
 	' -- ' +
-        '<span class="records">' + data.records + '/' + data.hits + '</span>';
+        '<span class="records">' + M('Retrieved records') + ': ' + data.records + '/' + data.hits + '</span>';
 }
 
 function my_onterm(data) {
@@ -306,8 +306,13 @@ function my_onbytarget(data) {
 	return;
     }
 
-    var table ='<table><thead><tr><td>Target ID</td><td>Hits</td><td>Diags</td>'
-        +'<td>Records</td><td>State</td></tr></thead><tbody>';
+    var table ='<table><thead><tr>' +
+	'<td>' + M('Target ID') + '</td>' +
+	'<td>' + M('Hits') + '</td>' +
+	'<td>' + M('Diags') + '</td>' +
+	'<td>' + M('Records') + '</td>' +
+	'<td>' + M('State') + '</td>' +
+	'</tr></thead><tbody>';
 
     for (var i = 0; i < data.length; i++ ) {
         table += "<tr><td>" + data[i].id +
@@ -550,14 +555,23 @@ function replaceHtml(el, html) {
 function renderDetails(data, marker)
 {
     var details = '<div class="details" id="mkwsDet_'+data.recid+'"><table>';
-    if (marker) details += '<tr><td>'+ marker + '</td></tr>';
+    if (marker) details += '<tr><td colspan="2">'+ marker + '</td></tr>';
+
+    var locations = [];
+    for (var i in data.location) {
+	locations.push(data.location[i]['@name']);
+    }
 
     details += renderField("Title", data["md-title"], data["md-title-remainder"], data["md-title-responsibility"]);
     details += renderField("Date", data["md-date"]);
     details += renderField("Author", data["md-author"]);
     details += renderField("URL", data["md-electronic-url"]);
     details += renderField("Subject", data["location"][0]["md-subject"]);
-    details += renderField("Location", data["location"][0]["@name"], data["location"][0]["@id"]);
+    if (locations.length == 0) {
+	details += '<tr><td colspan="2">No locations for record!</td></tr>';
+    } else {
+	details += renderField("Location" + (locations.length == 1 ? "" : "s"), locations);
+    }
     details += '</table></div>';
 
     return details;
@@ -568,19 +582,27 @@ function renderField(caption, data, data2, data3) {
 	return "";
     }
 
-    if (caption == "URL") {
-	data = '<a href="' + data + '" target="_blank">' + data + '</a>';
+    var res = "";
+    for (var i = 0; i < data.length; i++) {
+	var s = data[i];
+	if (i > 0)
+	    res += ", ";
+
+	if (caption == "URL")
+	    s = '<a href="' + s + '" target="_blank">' + s + '</a>';
+
+	res += s
     }
 
     if (data2 != undefined) {
-	data = data + " (" + data2 + ")";
+	res = res + " (" + data2 + ")";
     }
 
     if (data3 != undefined) {
-	data = data + " <i>" + data3 + "</i>";
+	res = res + " <i>" + data3 + "</i>";
     }
 
-    return '<tr><th>' + M(caption) + '</th><td>' + data + '</td></tr>';
+    return '<tr><th>' + M(caption) + '</th><td>' + res + '</td></tr>';
 }
 
 
@@ -650,7 +672,8 @@ function mkws_html_all() {
     mkws_html_switch();
 
     if (mkws_config.use_service_proxy)
-	mkws_service_proxy_auth(mkws_config.service_proxy_auth);
+	  mkws_service_proxy_auth(mkws_config.service_proxy_auth, 
+          mkws_config.service_proxy_auth_domain);
 
     if (mkws_config.responsive_design_width) {
 	// Responsive web design - change layout on the fly based on
@@ -674,7 +697,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 {
@@ -713,7 +736,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>';
 
@@ -743,16 +766,13 @@ function mkws_html_perpage() {
  * The username/password is configured in the apache config file
  * for the site.
  */
-function mkws_service_proxy_auth(auth_url) {
-    if (!auth_url)
-	auth_url = "http://mkws.indexdata.com/service-proxy-auth";
-
+function mkws_service_proxy_auth(auth_url, auth_domain) {
     debug("Run service proxy auth URL: " + auth_url);
 
     var request = new pzHttpRequest(auth_url, function(err) {
-	alert("HTTP call for authentication failed: " + err)
-	return;
-    });
+	  alert("HTTP call for authentication failed: " + err)
+	  return;
+    }, auth_domain);
 
     request.get(null, function(data) {
 	if (!$.isXMLDoc(data)) {
@@ -846,7 +866,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;
 }
 
 /*