X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-filter.js;h=4943ca15d5aad1a402e7db09f147a7be10ca4413;hb=c6b0e0a333fcf696f90333f28fbebcd3c228dea3;hp=e37a0bd319bb0e53ff2ca23ca101da63fc11b653;hpb=b77d3c71a27d3ef8323789281ea88efdebc158b5;p=mkws-moved-to-github.git diff --git a/src/mkws-filter.js b/src/mkws-filter.js index e37a0bd..4943ca1 100644 --- a/src/mkws-filter.js +++ b/src/mkws-filter.js @@ -5,8 +5,8 @@ function filterSet(team) { var that = {}; - that.list = function() { - return m_list; + that.toJSON = function() { + return $.toJSON(m_list); }; that.add = function(filter) { @@ -53,26 +53,23 @@ 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 res = initial || ""; @@ -86,7 +83,7 @@ function filterSet(team) { } return res; - } + }; return that;