X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-filter.js;h=4d600cc58ae26b4f5cbbe0a67a8f2ef7fe306e89;hb=6818463d210ae374dae4f1f1b2ac12ecbbb1293e;hp=eff521cb8116134a0533725b832a5ee4e2e6a246;hpb=d2de378b5618363f7cbd66bc91ece4c8f1157af4;p=mkws-moved-to-github.git diff --git a/src/mkws-filter.js b/src/mkws-filter.js index eff521c..4d600cc 100644 --- a/src/mkws-filter.js +++ b/src/mkws-filter.js @@ -7,7 +7,7 @@ function filterSet(team) { that.toJSON = function() { return $.toJSON(m_list); - } + }; that.add = function(filter) { m_list.push(filter); @@ -53,28 +53,34 @@ function filterSet(team) { } } return false; - } + }; that.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.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) { @@ -86,8 +92,11 @@ function filterSet(team) { } return res; - } + }; + that.NEW_pp2limit = function(initial) { + return that.OLD_pp2limit(initial); + } return that; }