Remove outdated comment.

[mkws-moved-to-github.git] / src / mkws-team.js

diff --git a/src/mkws-team.js b/src/mkws-team.js
index a346446..1ad267d 100644 (file)
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -260,8 +260,6 @@ function team($, teamName) {
        resetPage();
        queue("navi").publish();
 
-       var pp2filter = "";
-       var pp2limit = limit || "";
 
        // Continue to use previous query/sort-order unless new ones are specified
        if (query) {
@@ -277,27 +275,8 @@ function team($, teamName) {
            m_filterSet.add(filter(id, id));
        }
 
-       for (var i in m_filterSet.list()) {
-           var filter = m_filterSet.list()[i];
-           if (filter.id) {
-               if (pp2filter)
-                   pp2filter += ",";
-               if (filter.id.match(/^[a-z:]+[=~]/)) {
-                   log("filter '" + filter.id + "' already begins with SETTING OP");
-               } else {
-                   filter.id = 'pz:id=' + filter.id;
-               }
-               pp2filter += filter.id;
-           }
-       }
-       for (var i in m_filterSet.list()) {
-           var filter = m_filterSet.list()[i];
-           if (!filter.id) {
-               if (pp2limit)
-                   pp2limit += ",";
-               pp2limit += filter.field + "=" + filter.value.replace(/[\\|,]/g, '\\$&');
-           }
-       }
+       var pp2filter = m_filterSet.pp2filter();
+       var pp2limit = m_filterSet.pp2limit(limit);
 
        var params = {};
        if (pp2limit) {
@@ -315,8 +294,6 @@ function team($, teamName) {
        log("triggerSearch(" + m_query + "): filters = " + $.toJSON(m_filterSet.list()) + ", " +
            "pp2filter = " + pp2filter + ", params = " + $.toJSON(params));
 
-       // 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_sortOrder, pp2filter, undefined, params);
     }