Remove pp2limit regression-testing scaffold.

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

diff --git a/src/mkws-filter.js b/src/mkws-filter.js
index 02ce422..f19edcb 100644 (file)
--- a/src/mkws-filter.js
+++ b/src/mkws-filter.js
@@ -56,34 +56,6 @@ function filterSet(team) {
     };
 
     that.pp2filter = function() {
-       var OLD = that.OLD_pp2filter();
-       var NEW = that.NEW_pp2filter();
-       if (OLD !== NEW) {
-           alert("pp2filter(): OLD[" + OLD + "] !== NEW[" + NEW + "]");
-       }
-       return OLD;
-    };
-
-    that.OLD_pp2filter = function() {
-       var res = "";
-
-       for (var i in m_list) {
-           var filter = m_list[i];
-           if (filter.id) {
-               if (res) res += ",";
-               if (filter.id.match(/^[a-z:]+[=~]/)) {
-                   m_team.log("filter '" + filter.id + "' already begins with SETTING OP");
-               } else {
-                   filter.id = 'pz:id=' + filter.id;
-               }
-               res += filter.id;
-           }
-       }
-
-       return res;
-    };
-
-    that.NEW_pp2filter = function() {
        var res = "";
 
        that.visitTargets(function(id, name) {
@@ -102,17 +74,12 @@ function filterSet(team) {
     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, '\\$&');
-           }
-       }
-
+       that.visitFields(function(field, value) {
+           if (res) res += ",";
+           res += field + "=" + value.replace(/[\\|,]/g, '\\$&');
+       });
        return res;
-    };
-
+    }
 
     return that;
 }