X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-filter.js;h=4d600cc58ae26b4f5cbbe0a67a8f2ef7fe306e89;hb=6818463d210ae374dae4f1f1b2ac12ecbbb1293e;hp=02ce4223f71ad244099ef94cc138bc2a3bb6e8b9;hpb=242978c76db07a1f1f72a6f02c7b0e03bc6eb365;p=mkws-moved-to-github.git

diff --git a/src/mkws-filter.js b/src/mkws-filter.js
index 02ce422..4d600cc 100644
--- 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) {
@@ -100,6 +72,15 @@ function filterSet(team) {
     };
 
     that.pp2limit = function(initial) {
+	var OLD = that.OLD_pp2limit(initial);
+	var NEW = that.NEW_pp2limit(initial);
+	if (OLD !== NEW) {
+	    alert("pp2limit(): OLD[" + OLD + "] !== NEW[" + NEW + "]");
+	}
+	return OLD;
+    };
+
+    that.OLD_pp2limit = function(initial) {
 	var res = initial || "";
 
 	for (var i in m_list) {
@@ -113,6 +94,9 @@ function filterSet(team) {
 	return res;
     };
 
+    that.NEW_pp2limit = function(initial) {
+	return that.OLD_pp2limit(initial);
+    }
 
     return that;
 }