Remove no-longer needed OLD-vs-NEW scaffolding around pp2filter.

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

diff --git a/src/mkws-filter.js b/src/mkws-filter.js
index 232d0d5..4943ca1 100644 (file)
--- a/src/mkws-filter.js
+++ b/src/mkws-filter.js
@@ -1,30 +1,91 @@
 // Factory function for sets of filters.
-function filterSet() {
-    var that = {};
+function filterSet(team) {
+    var m_team = team;
     var m_list = [];
 
-    that.list = function() {
-       return m_list;
+    var that = {};
+
+    that.toJSON = function() {
+       return $.toJSON(m_list);
     };
 
     that.add = function(filter) {
        m_list.push(filter);
     };
 
+    that.visitTargets = function(callback) {
+       for (var i in m_list) {
+           var filter = m_list[i];
+           if (filter.id) {
+               callback(filter.id, filter.name);
+           }
+       }
+    };
+
+    that.visitFields = function(callback) {
+       for (var i in m_list) {
+           var filter = m_list[i];
+           if (!filter.id) {
+               callback(filter.field, filter.value);
+           }
+       }
+    };
+
     that.removeMatching = function(matchFn) {
        var newList = [];
        for (var i in m_list) {
            var filter = m_list[i];
            if (matchFn(filter)) {
-               log("removeMatching() removing filter " + $.toJSON(filter));
+               m_team.log("removeMatching() removing filter " + $.toJSON(filter));
            } else {
-               log("removeMatching() keeping filter " + $.toJSON(filter));
+               m_team.log("removeMatching() keeping filter " + $.toJSON(filter));
                newList.push(filter);
            }
        }
        m_list = newList;
     };
 
+    that.targetFiltered = function(id) {
+       for (var i = 0; i < m_list.length; i++) {
+           if (m_list[i].id === id ||
+               m_list[i].id === 'pz:id=' + id) {
+               return true;
+           }
+       }
+       return false;
+    };
+
+    that.pp2filter = function() {
+       var res = "";
+
+       that.visitTargets(function(id, name) {
+           if (res) res += ",";
+           if (id.match(/^[a-z:]+[=~]/)) {
+               m_team.log("filter '" + id + "' already begins with SETTING OP");
+           } else {
+               id = 'pz:id=' + id;
+           }
+           res += id;
+       });
+
+       return res;
+    };
+
+    that.pp2limit = function(initial) {
+       var res = initial || "";
+
+       for (var i in m_list) {
+           var filter = m_list[i];
+           if (!filter.id) {
+               if (res) res += ",";
+               res += filter.field + "=" + filter.value.replace(/[\\|,]/g, '\\$&');
+           }
+       }
+
+       return res;
+    };
+
+
     return that;
 }