Change code to always explicitly handle arrays.

[mkws-moved-to-github.git] / tools / htdocs / mkws.js

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 2836fc5..e41e165 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -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,7 +555,19 @@ 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 sources = [];
+    for (var i in data.location) {
+       sources.push(data.location[i]['@name']);
+    }
+    if (sources.length == 0) {
+       details += '<tr><td colspan="2">No sources for record!</td></tr>';
+    } else if (sources.length == 1) {
+       details += renderField("Source", sources);
+    } else {
+       details += renderField("Sources", sources);
+    }
 
     details += renderField("Title", data["md-title"], data["md-title-remainder"], data["md-title-responsibility"]);
     details += renderField("Date", data["md-date"]);
@@ -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>';
 }