Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 6f57f6b..50eec65 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -229,14 +229,14 @@ function team($, teamName) {
     that.name = function() { return m_teamName; }
     var m_submitted = false;
     var m_query; // initially undefined
-    var m_sort; // will be set below
+    var m_sortOrder; // will be set below
     var m_perpage; // will be set below
     var m_filters = [];
     var m_totalRec = 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,15 +247,15 @@ 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);
     }
 
     debug("start running MKWS");
 
-    m_sort = mkws_config.sort_default;
+    m_sortOrder = mkws_config.sort_default;
     m_perpage = mkws_config.perpage_default;
 
     debug("Create main pz2 object");
@@ -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;
     }
@@ -502,7 +502,7 @@ function team($, teamName) {
        if (!m_submitted) return false;
        resetPage();
        loadSelect();
-       m_paz.show(0, m_perpage, m_sort);
+       m_paz.show(0, m_perpage, m_sortOrder);
        return false;
     }
 
@@ -542,9 +542,9 @@ function team($, teamName) {
     function loadSelect ()
     {
        var node = findnode('.mkwsSort');
-       if (node.length && node.val() != m_sort) {
-           debug("changing m_sort from " + m_sort + " to " + node.val());
-           m_sort = node.val();
+       if (node.length && node.val() != m_sortOrder) {
+           debug("changing m_sortOrder from " + m_sortOrder + " to " + node.val());
+           m_sortOrder = node.val();
        }
        node = findnode('.mkwsPerpage');
        if (node.length && node.val() != m_perpage) {
@@ -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_sort = sort;
+       if (sortOrder) {
+           m_sortOrder = sortOrder;
        }
        if (targets) {
            m_filters.push({ id: targets, name: targets });
@@ -597,7 +597,7 @@ function team($, teamName) {
 
        // We can use: params.torusquery = "udb=NAME"
        // Note: that won't work when running against raw pazpar2
-       m_paz.search(m_query, m_perpage, m_sort, pp2filter, undefined, params);
+       m_paz.search(m_query, m_perpage, m_sortOrder, pp2filter, undefined, params);
     }
 
 
@@ -903,7 +903,7 @@ function team($, teamName) {
 
 
     function mkwsHtmlSort() {
-       debug("HTML sort, m_sort = '" + m_sort + "'");
+       debug("HTML sort, m_sortOrder = '" + m_sortOrder + "'");
        var sort_html = '<select class="mkwsSort mkwsTeam_' + m_teamName + '">';
 
        for(var i = 0; i < mkws_config.sort_options.length; i++) {
@@ -912,7 +912,7 @@ function team($, teamName) {
            var val = opt.length == 1 ? opt[0] : opt[1];
 
            sort_html += '<option value="' + key + '"';
-           if (m_sort == key || m_sort == val) {
+           if (m_sortOrder == key || m_sortOrder == val) {
                sort_html += ' selected="selected"';
            }
            sort_html += '>' + M(val) + '</option>';
@@ -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);
     }