Simplify renderDetails(), eliminating repetition of HTML boilerplate.

[mkws-moved-to-github.git] / experiments / spclient / mkws.js

diff --git a/experiments/spclient/mkws.js b/experiments/spclient/mkws.js
index ee5c17a..c97464d 100644 (file)
--- a/experiments/spclient/mkws.js
+++ b/experiments/spclient/mkws.js
@@ -19,7 +19,7 @@ if (typeof mkws_config.use_service_proxy === 'undefined')
 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 service_proxy_url = mkws_config.service_proxy_url ? mkws_config.service_proxy_url : "http://mkws.indexdata.com/service-proxy/";
 
 var pazpar2path = mkws_config.use_service_proxy ? service_proxy_url : pazpar2_url;
 var usesessions = mkws_config.use_service_proxy ? false : true;
@@ -30,7 +30,7 @@ var mkws_locale_lang = {
        "Authors": "Autoren",
        "Subjects": "Schlagwörter",
        "Sources": "Daten und Quellen",
-       "TERMLISTS": "Termlisten",
+       "Termlists": "Termlisten",
        "Next": "Weiter",
        "Prev": "Zurück",
        "Search": "Suche",
@@ -54,7 +54,7 @@ var mkws_locale_lang = {
        "Authors": "Forfattere",
        "Subjects": "Emner",
        "Sources": "Kilder",
-       "TERMLISTS": "TERMLISTS",
+       "Termlists": "Termlists",
        "Next": "Næste",
        "Prev": "Forrige",
        "Search": "Søg",
@@ -150,11 +150,11 @@ function my_onstat(data) {
     if (stat == null)
        return;
 
-    stat.innerHTML = '<b>STATUS INFO</b> -- Active clients: '
-                        + data.activeclients
-                        + '/' + data.clients + ' -- </span>'
-                        + '<span>Retrieved records: ' + data.records
-                        + '/' + data.hits + ' :.</span>';
+    stat.innerHTML = '<span class="head">Status info</span>' +
+       ' -- ' +
+       '<span class="clients">' + data.activeclients + '/' + data.clients + '</span>' +
+       ' -- ' +
+        '<span class="records">' + data.records + '/' + data.hits + '</span>';
 }
 
 function my_onterm(data) {
@@ -162,20 +162,27 @@ function my_onterm(data) {
        return;
     
     var termlists = [];
-    termlists.push('<hr/><b>' + M('TERMLISTS') + ':</b><hr/><div class="termtitle">' + M('Sources') + '</div>');
+    termlists.push('<div class="title">' + M('Termlists') + '</div>');
+
+    termlists.push('<div class="facet">');
+    termlists.push('<div class="termtitle">' + M('Sources') + '</div>');
     for (var i = 0; i < data.xtargets.length && i < SourceMax; i++ ) {
         termlists.push('<a href="#" target_id='+data.xtargets[i].id
             + ' onclick="limitTarget(this.getAttribute(\'target_id\'), this.firstChild.nodeValue);return false;">' + data.xtargets[i].name
         + ' </a><span> (' + data.xtargets[i].freq + ')</span><br/>');
     }
+    termlists.push('</div>');
 
-    termlists.push('<hr/><div class="termtitle">' + M('Subjects') + '</div>');
+    termlists.push('<div class="facet">');
+    termlists.push('<div class="termtitle">' + M('Subjects') + '</div>');
     for (var i = 0; i < data.subject.length && i < SubjectMax; i++ ) {
         termlists.push('<a href="#" onclick="limitQuery(\'su\', this.firstChild.nodeValue);return false;">' + data.subject[i].name + '</a><span>  ('
               + data.subject[i].freq + ')</span><br/>');
     }
+    termlists.push('</div>');
 
-    termlists.push('<hr/><div class="termtitle">' + M('Authors') + '</div>');
+    termlists.push('<div class="facet">');
+    termlists.push('<div class="termtitle">' + M('Authors') + '</div>');
     for (var i = 0; i < data.author.length && i < AuthorMax; i++ ) {
         termlists.push('<a href="#" onclick="limitQuery(\'au\', this.firstChild.nodeValue);return false;">'
                             + data.author[i].name
@@ -183,6 +190,8 @@ function my_onterm(data) {
                             + data.author[i].freq
                             + ')</span><br/>');
     }
+    termlists.push('</div>');
+
     var termlist = document.getElementById("termlist");
     replaceHtml(termlist, termlists.join(''));
 }
@@ -234,6 +243,7 @@ function onFormSubmitEventHandler()
     resetPage();
     loadSelect();
     triggerSearch();
+    switchView('records'); // In case it's configured to start off as hidden
     submitted = true;
     return false;
 }
@@ -369,15 +379,23 @@ function switchView(view) {
 
     var targets = document.getElementById('mkwsTargets');
     var records = document.getElementById('mkwsRecords');
+    var blanket = document.getElementById('mkwsBlanket');
 
     switch(view) {
         case 'targets':
             targets.style.display = "block";
             records.style.display = "none";
+            if (blanket) { blanket.style.display = "none"; }
             break;
         case 'records':
             targets.style.display = "none";
             records.style.display = "block";
+            if (blanket) { blanket.style.display = "block"; }
+            break;
+       case 'none':
+            targets.style.display = "none";
+            records.style.display = "none";
+            if (blanket) { blanket.style.display = "none"; }
             break;
         default:
             alert('Unknown view.');
@@ -424,30 +442,39 @@ function renderDetails(data, marker)
 {
     var details = '<div class="details" id="det_'+data.recid+'"><table>';
     if (marker) details += '<tr><td>'+ marker + '</td></tr>';
-    if (data["md-title"] != undefined) {
-        details += '<tr><td><b>' + M('Title') + '</b></td><td><b>:</b> '+data["md-title"];
-       if (data["md-title-remainder"] !== undefined) {
-             details += ' : <span>' + data["md-title-remainder"] + ' </span>';
-       }
-       if (data["md-title-responsibility"] !== undefined) {
-             details += ' <span><i>'+ data["md-title-responsibility"] +'</i></span>';
-       }
-         details += '</td></tr>';
-    }
-    if (data["md-date"] != undefined)
-        details += '<tr><td><b>' + M('Date') + '</b></td><td><b>:</b> ' + data["md-date"] + '</td></tr>';
-    if (data["md-author"] != undefined)
-        details += '<tr><td><b>' + M('Author') + '</b></td><td><b>:</b> ' + data["md-author"] + '</td></tr>';
-    if (data["md-electronic-url"] != undefined)
-        details += '<tr><td><b>URL</b></td><td><b>:</b> <a href="' + data["md-electronic-url"] + '" target="_blank">' + data["md-electronic-url"] + '</a>' + '</td></tr>';
-    if (data["location"][0]["md-subject"] != undefined)
-        details += '<tr><td><b>' + M('Subject') + '</b></td><td><b>:</b> ' + data["location"][0]["md-subject"] + '</td></tr>';
-    if (data["location"][0]["@name"] != undefined)
-        details += '<tr><td><b>' + M('Location') + '</b></td><td><b>:</b> ' + data["location"][0]["@name"] + " (" +data["location"][0]["@id"] + ")" + '</td></tr>';
+
+    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"]);
     details += '</table></div>';
+
     return details;
 }
 
+function renderField(caption, data, data2, data3) {
+    if (data === undefined) {
+       return "";
+    }
+
+    if (caption == "URL") {
+       data = '<a href="' + data + '" target="_blank">' + data + '</a>';
+    }
+
+    if (data2 != undefined) {
+       data = data + " (" + data2 + ")";
+    }
+
+    if (data3 != undefined) {
+       data = data + " <i>" + data3 + "</i>";
+    }
+
+    return '<tr><td><b>' + M(caption) + '</b></td><td><b>:</b> ' + data + '</td></tr>';
+}
+
+
 /*
  * All the HTML stuff to render the search forms and
  * result pages.
@@ -512,7 +539,7 @@ function mkws_html_all(config) {
           <td valign="top">\
             <div id="ranking">\
               <form name="select" id="select" action="" >\
-        ' + M('Sort by') + mkws_html_sort(config) + '\
+        ' + M('Sort by') + ' ' + mkws_html_sort(config) + '\
         ' + M('and show') + ' ' + mkws_html_perpage(config) + '\
         ' + M('per page') + '.\
        </form>\
@@ -615,7 +642,7 @@ function mkws_html_perpage(config) {
  */
 function mkws_service_proxy_auth(auth_url) {
     if (!auth_url)
-       auth_url = "/service-proxy-auth";
+       auth_url = "http://mkws.indexdata.com/service-proxy-auth";
        
     debug("Run service proxy auth URL: " + auth_url);