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 353fce5..4943ca1 100644 (file)
--- a/src/mkws-filter.js
+++ b/src/mkws-filter.js
@@ -56,37 +56,21 @@ 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;
+       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.NEW_pp2filter = function() {
-       return that.OLD_pp2filter();
-    };
-
     that.pp2limit = function(initial) {
        var res = initial || "";