X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=ffac9fc1959bc03c7fe33c722ccaefffb394fc75;hb=16f6454ab6abbd986130d0327a32893a0b776e86;hp=5804c1f467ac33c40b1403c60fff4d850def9a1e;hpb=696a9388993c938ca456aa3e5db1a7630ad00d50;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 5804c1f..ffac9fc 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -232,11 +232,11 @@ function team($, teamName) {
     var m_sortOrder; // will be set below
     var m_perpage; // will be set below
     var m_filters = [];
-    var m_totalRec = 0;
+    var m_totalRecordCount = 0;
     var m_curPage = 1;
     var m_curDetRecId = '';
     var m_curDetRecData = null;
-    var m_debug_time = {
+    var m_debugTime = {
 	// Timestamps for logging
 	"start": $.now(),
 	"last": $.now()
@@ -247,8 +247,8 @@ function team($, teamName) {
 
     var debug = function (s) {
 	var now = $.now();
-	var timestamp = ((now - m_debug_time.start)/1000).toFixed(3) + " (+" + ((now - m_debug_time.last)/1000).toFixed(3) + ") "
-	m_debug_time.last = now;
+	var timestamp = ((now - m_debugTime.start)/1000).toFixed(3) + " (+" + ((now - m_debugTime.last)/1000).toFixed(3) + ") "
+	m_debugTime.last = now;
 
 	mkws.debug(m_teamName + ": " + timestamp + s);
     }
@@ -335,7 +335,7 @@ function team($, teamName) {
 
     function onShow(data, teamName) {
 	debug("show");
-	m_totalRec = data.merged;
+	m_totalRecordCount = data.merged;
 
 	var pager = findnode(".mkwsPager");
 	if (pager.length) {
@@ -420,7 +420,7 @@ function team($, teamName) {
 
 	//client indexes pages from 1 but pz2 from 0
 	var onsides = 6;
-	var pages = Math.ceil(m_totalRec / m_perpage);
+	var pages = Math.ceil(m_totalRecordCount / m_perpage);
 
 	var firstClkbl = (m_curPage - onsides > 0)
             ? m_curPage - onsides
@@ -478,7 +478,7 @@ function team($, teamName) {
     }
 
 
-    function newSearch(query, sort, targets)
+    function newSearch(query, sortOrder, targets)
     {
 	debug("newSearch: " + query);
 
@@ -491,7 +491,7 @@ function team($, teamName) {
 	redrawNavi();
 	resetPage();
 	loadSelect();
-	triggerSearch(query, sort, targets);
+	triggerSearch(query, sortOrder, targets);
 	switchView('records'); // In case it's configured to start off as hidden
 	m_submitted = true;
     }
@@ -535,7 +535,7 @@ function team($, teamName) {
     function resetPage()
     {
 	m_curPage = 1;
-	m_totalRec = 0;
+	m_totalRecordCount = 0;
     }
 
 
@@ -554,17 +554,17 @@ function team($, teamName) {
     }
 
 
-    function triggerSearch (query, sort, targets)
+    function triggerSearch (query, sortOrder, targets)
     {
 	var pp2filter = "";
 	var pp2limit = "";
 
-	// Re-use previous query/sort if new ones are not specified
+	// Re-use previous query/sort-order if new ones are not specified
 	if (query) {
 	    m_query = query;
 	}
-	if (sort) {
-	    m_sortOrder = sort;
+	if (sortOrder) {
+	    m_sortOrder = sortOrder;
 	}
 	if (targets) {
 	    m_filters.push({ id: targets, name: targets });
@@ -684,7 +684,7 @@ function team($, teamName) {
 
     // simple paging functions
     that.pagerNext = function () {
-	if (m_totalRec - m_perpage*m_curPage > 0) {
+	if (m_totalRecordCount - m_perpage*m_curPage > 0) {
             m_paz.showNext();
             m_curPage++;
 	}
@@ -985,14 +985,14 @@ function team($, teamName) {
 
 	debug("node=" + node + ", class='" + node.className + "', query=" + query);
 
-	var sort = node.attr('sort');
+	var sortOrder = node.attr('sort');
 	var targets = node.attr('targets');
 	var s = "running auto search: '" + query + "'";
-	if (sort) s += " sorted by '" + sort + "'";
+	if (sortOrder) s += " sorted by '" + sortOrder + "'";
 	if (targets) s += " in targets '" + targets + "'";
 	debug(s);
 
-	newSearch(query, sort, targets);
+	newSearch(query, sortOrder, targets);
     }