Fix misleading logging from delimitQuery()

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

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 815eaa7..b1a04d7 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -67,7 +67,7 @@ Handlebars.registerHelper('commaList', function(items, options) {
 
 
 // Some functions are visible to be called from outside code, namely
-// generated HTML: mkws.switchView(), showDetails(), limitTarget(),
+// generated HTML: that.switchView(), showDetails(), limitTarget(),
 // limitQuery(), delimitTarget(), delimitQuery(), pagerPrev(),
 // pagerNext(), showPage(). Also mkws.M() is made available for the
 // Handlebars helper 'translate'
@@ -292,7 +292,7 @@ function team($, teamName) {
     {
        var template = loadTemplate("Summary");
        hit._id = "mkwsRec_" + hit.recid;
-       hit._onclick = "mkws.showDetails(this.id, '" + m_teamName + "');return false;"
+       hit._onclick = "mkws.showDetails('" + m_teamName + "', this.id);return false;"
        return template(hit);
     }
 
@@ -347,7 +347,7 @@ function team($, teamName) {
 
 
     function add_single_facet(acc, caption, data, max, pzIndex) {
-       acc.push('<div class="facet" id="mkwsFacet' + caption + '">');
+       acc.push('<div class="facet mkwsFacet' + caption + ' mkwsTeam_' + m_teamName + '">');
        acc.push('<div class="termtitle">' + M(caption) + '</div>');
        for (var i = 0; i < data.length && i < max; i++) {
            acc.push('<div class="term">');
@@ -356,9 +356,9 @@ function team($, teamName) {
            if (!pzIndex) {
                // Special case: target selection
                acc.push('target_id='+data[i].id+' ');
-               action = 'mkws.limitTarget(this.getAttribute(\'target_id\'),this.firstChild.nodeValue)';
+               action = 'mkws.limitTarget(\'' + m_teamName + '\', this.getAttribute(\'target_id\'),this.firstChild.nodeValue)';
            } else {
-               action = 'mkws.limitQuery(\'' + pzIndex + '\', this.firstChild.nodeValue)';
+               action = 'mkws.limitQuery(\'' + m_teamName + '\', \'' + pzIndex + '\', this.firstChild.nodeValue)';
            }
            acc.push('onclick="' + action + ';return false;">' + data[i].name + '</a>'
                     + ' <span>' + data[i].freq + '</span>');
@@ -457,7 +457,7 @@ function team($, teamName) {
        }
 
        m_filters = []
-       redraw_navi(); // ### should use windowid
+       redraw_navi();
        resetPage(); // ### the globals it resents should be indexed by windowid
        loadSelect(); // ### should use windowid
        triggerSearch(query, sort, targets, windowid);
@@ -542,11 +542,11 @@ function team($, teamName) {
     }
 
 
-    // limit the query after clicking the facet
-    mkws.limitQuery = function (field, value)
+    // limit by target functions
+    that.limitTarget  = function (id, name)
     {
-       debug("limitQuery(field=" + field + ", value=" + value + ")");
-       m_filters.push({ field: field, value: value });
+       debug("limitTarget(id=" + id + ", name=" + name + ")");
+       m_filters.push({ id: id, name: name });
        redraw_navi();
        resetPage();
        loadSelect();
@@ -555,11 +555,11 @@ function team($, teamName) {
     }
 
 
-    // limit by target functions
-    mkws.limitTarget  = function (id, name)
+    // limit the query after clicking the facet
+    that.limitQuery = function (field, value)
     {
-       debug("limitTarget(id=" + id + ", name=" + name + ")");
-       m_filters.push({ id: id, name: name });
+       debug("limitQuery(field=" + field + ", value=" + value + ")");
+       m_filters.push({ field: field, value: value });
        redraw_navi();
        resetPage();
        loadSelect();
@@ -568,7 +568,7 @@ function team($, teamName) {
     }
 
 
-    mkws.delimitQuery = function (field, value)
+    that.delimitQuery = function (field, value)
     {
        debug("delimitQuery(field=" + field + ", value=" + value + ")");
        var newFilters = [];
@@ -577,9 +577,9 @@ function team($, teamName) {
            if (filter.field &&
                field == filter.field &&
                value == filter.value) {
-               debug("delimitTarget() removing filter " + $.toJSON(filter));
+               debug("delimitQuery() removing filter " + $.toJSON(filter));
            } else {
-               debug("delimitTarget() keeping filter " + $.toJSON(filter));
+               debug("delimitQuery() keeping filter " + $.toJSON(filter));
                newFilters.push(filter);
            }
        }
@@ -593,7 +593,7 @@ function team($, teamName) {
     }
 
 
-    mkws.delimitTarget = function (id)
+    that.delimitTarget = function (id)
     {
        debug("delimitTarget(id=" + id + ")");
        var newFilters = [];
@@ -618,7 +618,7 @@ function team($, teamName) {
 
     function redraw_navi ()
     {
-       var navi = document.getElementById('mkwsNavi');
+       var navi = $('.mkwsNavi.mkwsTeam_' + m_teamName);
        if (!navi) return;
 
        var text = "";
@@ -628,16 +628,16 @@ function team($, teamName) {
            }
            var filter = m_filters[i];
            if (filter.id) {
-               text += M('source') + ': <a class="crossout" href="#" onclick="mkws.delimitTarget(' +
-                   "'" + filter.id + "'" + ');return false;">' + filter.name + '</a>';
+               text += M('source') + ': <a class="crossout" href="#" onclick="mkws.delimitTarget(\'' + m_teamName +
+                   "', '" + filter.id + "'" + ');return false;">' + filter.name + '</a>';
            } else {
-               text += M(filter.field) + ': <a class="crossout" href="#" onclick="mkws.delimitQuery(' +
-                   "'" + filter.field + "', '" + filter.value + "'" +
+               text += M(filter.field) + ': <a class="crossout" href="#" onclick="mkws.delimitQuery(\'' + m_teamName +
+                   "', '" + filter.field + "', '" + filter.value + "'" +
                    ');return false;">' + filter.value + '</a>';
            }
        }
 
-       navi.innerHTML = text;
+       navi.html(text);
     }
 
 
@@ -1381,10 +1381,25 @@ function _mkws_jquery_plugin ($) {
     };
 
 
-    mkws.showDetails = function (prefixRecId, tname) {
+    mkws.showDetails = function (tname, prefixRecId) {
        mkws.teams[tname].showDetails(prefixRecId);
     }
 
+    mkws.limitTarget  = function (tname, id, name) {
+       mkws.teams[tname].limitTarget(id, name);
+    }
+
+    mkws.limitQuery  = function (tname, field, value) {
+       mkws.teams[tname].limitQuery(field, value);
+    }
+
+    mkws.delimitTarget = function (tname, id) {
+       mkws.teams[tname].delimitTarget(id);
+    }
+
+    mkws.delimitQuery = function (tname, field, value) {
+       mkws.teams[tname].delimitQuery(field, value);
+    }
 
     function default_mkws_config() {
        /* default mkws config */