X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=e9da39d6fcdc323c77e83775985e47ba9a7a704e;hb=2ff86cfc8d8fd83b34a8600f3e7bc0a4e0da60d3;hp=d7764ddc7bb1318e473b3160171fd6d48727a5eb;hpb=466c06ce3e322fbcb1bacb32aefd6be4c1dfcf8e;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index d7764dd..e9da39d 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -155,10 +155,10 @@ function team($, teamName) {
     var m_teamName = teamName;
     var m_submitted = false;
     var m_query; // initially undefined
-    var m_sort = 'relevance';
+    var m_sort; // will be set below
+    var m_perpage; // will be set below
     var m_filters = [];
     var m_totalRec = 0;
-    var m_recPerPage = 20;
     var m_curPage = 1;
     var m_curDetRecId = '';
     var m_curDetRecData = null;
@@ -242,7 +242,7 @@ function team($, teamName) {
 		      "onrecord": my_onrecord });
 
     if (!isNaN(parseInt(mkws_config.perpage_default))) {
-	m_recPerPage = parseInt(mkws_config.perpage_default);
+	m_perpage = parseInt(mkws_config.perpage_default);
     }
 
 
@@ -452,7 +452,7 @@ function team($, teamName) {
 
 	m_filters = []
 	redraw_navi();
-	resetPage(); // ### the globals it resents should be indexed by windowid
+	resetPage();
 	loadSelect();
 	triggerSearch(query, sort, targets, windowid);
 	that.switchView('records'); // In case it's configured to start off as hidden
@@ -465,7 +465,7 @@ function team($, teamName) {
 	if (!m_submitted) return false;
 	resetPage();
 	loadSelect();
-	m_paz.show(0, m_recPerPage, m_sort);
+	m_paz.show(0, m_perpage, m_sort);
 	return false;
     }
 
@@ -521,7 +521,7 @@ function team($, teamName) {
 	}
 	debug("triggerSearch(" + m_query + "): filters = " + $.toJSON(m_filters) + ", pp2filter = " + pp2filter + ", params = " + $.toJSON(params));
 
-	m_paz.search(m_query, m_recPerPage, m_sort, pp2filter, undefined, params);
+	m_paz.search(m_query, m_perpage, m_sort, pp2filter, undefined, params);
     }
 
 
@@ -533,9 +533,9 @@ function team($, teamName) {
 	    m_sort = node.val();
 	}
 	node = $('.mkwsPerpage.mkwsTeam_' + m_teamName);
-	if (node.length && node.val() != m_recPerPage) {
-	    debug("changing m_recPerPage from " + m_recPerPage + " to " + node.val());
-	    m_recPerPage = node.val();
+	if (node.length && node.val() != m_perpage) {
+	    debug("changing m_perpage from " + m_perpage + " to " + node.val());
+	    m_perpage = node.val();
 	}
     }
 
@@ -648,7 +648,7 @@ function team($, teamName) {
 
 	//client indexes pages from 1 but pz2 from 0
 	var onsides = 6;
-	var pages = Math.ceil(m_totalRec / m_recPerPage);
+	var pages = Math.ceil(m_totalRec / m_perpage);
 
 	var firstClkbl = (m_curPage - onsides > 0)
             ? m_curPage - onsides
@@ -660,7 +660,7 @@ function team($, teamName) {
 
 	var prev = '<span id="mkwsPrev">&#60;&#60; ' + M('Prev') + '</span><b> | </b>';
 	if (m_curPage > 1)
-            prev = '<a href="#" id="mkwsPrev" onclick="mkws.pagerPrev();">'
+            prev = '<a href="#" id="mkwsPrev" onclick="mkws.pagerPrev(\'' + m_teamName + '\');">'
             +'&#60;&#60; ' + M('Prev') + '</a><b> | </b>';
 
 	var middle = '';
@@ -669,13 +669,13 @@ function team($, teamName) {
             if(i == m_curPage)
 		numLabel = '<b>' + i + '</b>';
 
-            middle += '<a href="#" onclick="mkws.showPage(' + i + ')"> '
+            middle += '<a href="#" onclick="mkws.showPage(\'' + m_teamName + '\', ' + i + ')"> '
 		+ numLabel + ' </a>';
 	}
 
 	var next = '<b> | </b><span id="mkwsNext">' + M('Next') + ' &#62;&#62;</span>';
 	if (pages - m_curPage > 0)
-            next = '<b> | </b><a href="#" id="mkwsNext" onclick="mkws.pagerNext()">'
+            next = '<b> | </b><a href="#" id="mkwsNext" onclick="mkws.pagerNext(\'' + m_teamName + '\')">'
             + M('Next') + ' &#62;&#62;</a>';
 
 	var predots = '';
@@ -693,7 +693,7 @@ function team($, teamName) {
     }
 
 
-    mkws.showPage = function (pageNum)
+    that.showPage = function (pageNum)
     {
 	m_curPage = pageNum;
 	m_paz.showPage(m_curPage - 1);
@@ -701,15 +701,15 @@ function team($, teamName) {
 
 
     // simple paging functions
-    mkws.pagerNext = function () {
-	if (m_totalRec - m_recPerPage*m_curPage > 0) {
+    that.pagerNext = function () {
+	if (m_totalRec - m_perpage*m_curPage > 0) {
             m_paz.showNext();
             m_curPage++;
 	}
     }
 
 
-    mkws.pagerPrev = function () {
+    that.pagerPrev = function () {
 	if (m_paz.showPrev() != false)
             m_curPage--;
     }
@@ -1039,14 +1039,14 @@ function team($, teamName) {
 
 
     function mkws_html_perpage() {
-	debug("HTML perpage");
+	debug("HTML perpage, m_perpage = " + m_perpage);
 	var perpage_html = '<select class="mkwsPerpage mkwsTeam_' + m_teamName + '">';
 
 	for(var i = 0; i < mkws_config.perpage_options.length; i++) {
 	    var key = mkws_config.perpage_options[i];
 
 	    perpage_html += '<option value="' + key + '"';
-	    if (key == mkws_config.perpage_default) {
+	    if (key == m_perpage) {
 		perpage_html += ' selected="selected"';
 	    }
 	    perpage_html += '>' + key + '</option>';
@@ -1356,6 +1356,18 @@ function _mkws_jquery_plugin ($) {
 	mkws.teams[tname].delimitQuery(field, value);
     }
 
+    mkws.showPage = function (tname, pageNum) {
+	mkws.teams[tname].showPage(pageNum);
+    }
+
+    mkws.pagerPrev = function (tname) {
+	mkws.teams[tname].pagerPrev();
+    }
+
+    mkws.pagerNext = function (tname) {
+	mkws.teams[tname].pagerNext();
+    }
+
 
     function default_mkws_config() {
 	/* default mkws config */