X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=11f17fd1874bff4fb4f90988af04efdf6e876994;hb=0738880132a6318e53574fc5c93e73acf0f9d292;hp=37694228ae9f19a617ef1d7fb25abd1b7e0cfe99;hpb=0afab23ce298ced8796a4762d1e9bb0bfb0703f9;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 3769422..11f17fd 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -4,7 +4,9 @@
 "use strict"; // HTML5: disable for debug_level >= 2
 
 // Set up namespace and some state.
-var mkws = {};
+var mkws = {
+    pp2filter: null,
+};
 
 /*
  * global config object: mkws_config
@@ -176,7 +178,6 @@ var totalRec = 0;
 var curDetRecId = '';
 var curDetRecData = null;
 var curSort = 'relevance';
-var curFilter = null;
 var submitted = false;
 var SourceMax = 16;
 var SubjectMax = 10;
@@ -194,12 +195,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");
 
@@ -370,7 +374,7 @@ function resetPage()
 
 function triggerSearch ()
 {
-    my_paz.search(document.mkwsSearchForm.mkwsQuery.value, recPerPage, curSort, curFilter);
+    my_paz.search(document.mkwsSearchForm.mkwsQuery.value, recPerPage, curSort, mkws.pp2filter);
 }
 
 function loadSelect ()
@@ -386,6 +390,7 @@ function loadSelect ()
 // limit the query after clicking the facet
 mkws.limitQuery = function (field, value)
 {
+    debug("limitQuery(field=" + field + ", value=" + value + ")");
     document.mkwsSearchForm.mkwsQuery.value += ' and ' + field + '="' + value + '"';
     onFormSubmitEventHandler();
 }
@@ -393,11 +398,12 @@ mkws.limitQuery = function (field, value)
 // limit by target functions
 mkws.limitTarget  = function (id, name)
 {
+    debug("limitTarget(id=" + id + ", name=" + name + ")");
     var navi = document.getElementById('mkwsNavi');
     navi.innerHTML =
         'Source: <a class="crossout" href="#" onclick="mkws.delimitTarget();return false;">'
         + name + '</a>';
-    curFilter = 'pz:id=' + id;
+    mkws.pp2filter = 'pz:id=' + id;
     resetPage();
     loadSelect();
     triggerSearch();
@@ -408,7 +414,7 @@ mkws.delimitTarget = function ()
 {
     var navi = document.getElementById('mkwsNavi');
     navi.innerHTML = '';
-    curFilter = null;
+    mkws.pp2filter = null;
     resetPage();
     loadSelect();
     triggerSearch();
@@ -569,10 +575,8 @@ function renderDetails(data, marker)
     details += renderField("Subject", data["location"][0]["md-subject"]);
     if (locations.length == 0) {
 	details += '<tr><td colspan="2">No locations for record!</td></tr>';
-    } else if (locations.length == 1) {
-	details += renderField("Location", locations);
     } else {
-	details += renderField("Locations", locations);
+	details += renderField("Location" + (locations.length == 1 ? "" : "s"), locations);
     }
     details += '</table></div>';
 
@@ -674,7 +678,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
@@ -767,13 +772,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)) {