Move curFilter global into mkws hash.

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

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 4f4cc5c..acf3235 100644 (file)
--- 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 = {
+    curFilter: 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.curFilter);
 }
 
 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.curFilter = 'pz:id=' + id;
     resetPage();
     loadSelect();
     triggerSearch();
@@ -408,7 +414,7 @@ mkws.delimitTarget = function ()
 {
     var navi = document.getElementById('mkwsNavi');
     navi.innerHTML = '';
-    curFilter = null;
+    mkws.curFilter = null;
     resetPage();
     loadSelect();
     triggerSearch();