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

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 2f3db65..ee13dba 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -194,12 +194,15 @@ function my_onshow(data) {
     totalRec = data.merged;
     // move it out
     var pager = document.getElementById("mkwsPager");
-    pager.innerHTML = "";
-    pager.innerHTML +='<div style="float: right">' + M('Displaying') + ': '
-                    + (data.start + 1) + ' ' + M('to') + ' ' + (data.start + data.num) +
-                     ' ' + M('of') + ' ' + data.merged + ' (' + M('found') + ': '
-                     + data.total + ')</div>';
-    drawPager(pager);
+    if (pager) {
+	pager.innerHTML = "";
+	pager.innerHTML +='<div style="float: right">' + M('Displaying') + ': '
+            + (data.start + 1) + ' ' + M('to') + ' ' + (data.start + data.num) +
+            ' ' + M('of') + ' ' + data.merged + ' (' + M('found') + ': '
+            + data.total + ')</div>';
+	drawPager(pager);
+    }
+
     // navi
     var results = document.getElementById("mkwsRecords");
 
@@ -229,11 +232,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">Active clients: ' + data.activeclients + '/' + data.clients + '</span>' +
+	'<span class="clients">' + M('Active clients') + ': ' + data.activeclients + '/' + data.clients + '</span>' +
 	' -- ' +
-        '<span class="records">Retrieved records: ' + data.records + '/' + data.hits + '</span>';
+        '<span class="records">' + M('Retrieved records') + ': ' + data.records + '/' + data.hits + '</span>';
 }
 
 function my_onterm(data) {
@@ -306,8 +309,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 +558,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 +585,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 +675,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
@@ -743,13 +769,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) {
+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)) {