X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmkws-filter.js;h=219ccd5ccabded37f367d47a3b9a297cc3dccb6c;hb=21fc191d487bffa9592be523f1fb54ad3f44ef08;hp=232d0d5a520fc75f3b1e7948311188b8884d4e4b;hpb=681a6de3a7f4d1c9493d66157b11c948c59434ae;p=mkws-moved-to-github.git

diff --git a/src/mkws-filter.js b/src/mkws-filter.js
index 232d0d5..219ccd5 100644
--- a/src/mkws-filter.js
+++ b/src/mkws-filter.js
@@ -1,8 +1,10 @@
 // Factory function for sets of filters.
-function filterSet() {
-    var that = {};
+function filterSet(team) {
+    var m_team = team;
     var m_list = [];
 
+    var that = {};
+
     that.list = function() {
 	return m_list;
     };
@@ -16,15 +18,59 @@ function filterSet() {
 	for (var i in m_list) {
 	    var filter = m_list[i];
 	    if (matchFn(filter)) {
-		log("removeMatching() removing filter " + $.toJSON(filter));
+		m_team.log("removeMatching() removing filter " + $.toJSON(filter));
 	    } else {
-		log("removeMatching() keeping filter " + $.toJSON(filter));
+		m_team.log("removeMatching() keeping filter " + $.toJSON(filter));
 		newList.push(filter);
 	    }
 	}
 	m_list = newList;
     };
 
+    that.targetFiltered = function(id) {
+	for (var i = 0; i < m_list.length; i++) {
+	    if (m_list[i].id === id ||
+		m_list[i].id === 'pz:id=' + id) {
+		return true;
+	    }
+	}
+	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;
+	    }
+	}
+
+	return res;
+    }
+
+    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, '\\$&');
+	    }
+	}
+
+	return res;
+    }
+
+
     return that;
 }