X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-filter.js;h=7d9fac06672e02ca220922301fb8d0a6bd210805;hb=fea2b711c389ba5f31aed757622fe268b7084768;hp=e37a0bd319bb0e53ff2ca23ca101da63fc11b653;hpb=b77d3c71a27d3ef8323789281ea88efdebc158b5;p=mkws-moved-to-github.git

diff --git a/src/mkws-filter.js b/src/mkws-filter.js
index e37a0bd..7d9fac0 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) {
@@ -16,7 +16,7 @@ function filterSet(team) {
     that.visitTargets = function(callback) {
 	for (var i in m_list) {
 	    var filter = m_list[i];
-	    if (filter.id) {
+	    if (filter.type === 'target') {
 		callback(filter.id, filter.name);
 	    }
 	}
@@ -25,7 +25,7 @@ function filterSet(team) {
     that.visitFields = function(callback) {
 	for (var i in m_list) {
 	    var filter = m_list[i];
-	    if (!filter.id) {
+	    if (filter.type === 'field') {
 		callback(filter.field, filter.value);
 	    }
 	}
@@ -47,61 +47,64 @@ function filterSet(team) {
 
     that.targetFiltered = function(id) {
 	for (var i = 0; i < m_list.length; i++) {
-	    if (m_list[i].id === id ||
+	    if (m_list[i].type === 'target' ||
 		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;
+	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 || "";
 
-	for (var i in m_list) {
-	    var filter = m_list[i];
-	    if (!filter.id) {
-		if (res) res += ",";
-		res += filter.field + "=" + filter.value.replace(/[\\|,]/g, '\\$&');
-	    }
-	}
-
+	that.visitFields(function(field, value) {
+	    if (res) res += ",";
+	    res += field + "=" + value.replace(/[\\|,]/g, '\\$&');
+	});
 	return res;
     }
 
-
     return that;
 }
 
 
-// Factory function for filters. These can be of several types.
-function filter(id, name, field, value) {
-    var res;
+// Factory functions for filters. These can be of several types.
+function targetFilter(id, name) {
+    return {
+        type: 'target',
+        id: id,
+        name: name
+    };
+}
 
-    if (id) {
-	res = { id: id, name: name };
-    } else {
-	res = { field: field, value: value };
-    }
+function fieldFilter(field, value) {
+    return {
+        type: 'field',
+        field: field,
+        value: value
+    };
+}
 
-    return res;
+function categoryFilter(id) {
+    return {
+        type: 'category',
+        id: id,
+    };
 }