X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-team.js;h=4c59becdcdef59b31a6d62430b9bb3fba69d53dc;hb=9186abcca4ee19b73053093c6ba90abc252ff5f9;hp=e2890e26adfcf52c8e3a74afb6774770dc1ef171;hpb=2bee41bb1fc715929a49f6f1686e78322bf9b4a6;p=mkws-moved-to-github.git

diff --git a/src/mkws-team.js b/src/mkws-team.js
index e2890e2..4c59bec 100644
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -169,7 +169,7 @@ function team($, teamName) {
 
     that.limitTarget = function(id, name) {
 	log("limitTarget(id=" + id + ", name=" + name + ")");
-	m_filterSet.add(filter(id, name));
+	m_filterSet.add(targetFilter(id, name));
 	triggerSearch();
 	return false;
     };
@@ -177,7 +177,7 @@ function team($, teamName) {
 
     that.limitQuery = function(field, value) {
 	log("limitQuery(field=" + field + ", value=" + value + ")");
-	m_filterSet.add(filter(null, null, field, value));
+	m_filterSet.add(fieldFilter(field, value));
 	triggerSearch();
 	return false;
     };
@@ -185,15 +185,15 @@ function team($, teamName) {
 
     that.limitCategory = function(id) {
 	log("limitCategory(id=" + id + ")");
-	// ### Add a filter
-	// ### triggerSearch() if there's a query
+	m_filterSet.add(categoryFilter(id));
+        if (m_query) triggerSearch();
 	return false;
     };
 
 
     that.delimitTarget = function(id) {
 	log("delimitTarget(id=" + id + ")");
-	m_filterSet.removeMatching(function(f) { return f.id });
+	m_filterSet.removeMatching(function(f) { return f.type === 'target' });
 	triggerSearch();
 	return false;
     };
@@ -201,7 +201,8 @@ function team($, teamName) {
 
     that.delimitQuery = function(field, value) {
 	log("delimitQuery(field=" + field + ", value=" + value + ")");
-	m_filterSet.removeMatching(function(f) { return f.field && field == f.field && value == f.value });
+	m_filterSet.removeMatching(function(f) { return f.type == 'field' &&
+                                                 field == f.field && value == f.value });
 	triggerSearch();
 	return false;
     };
@@ -265,7 +266,7 @@ function team($, teamName) {
 	if (query) m_query = query;
 	if (sortOrder) m_sortOrder = sortOrder;
 	if (perpage) m_perpage = perpage;
-	if (targets) m_filterSet.add(filter(id, id));
+	if (targets) m_filterSet.add(targetFilter(id, id));
 
 	var pp2filter = m_filterSet.pp2filter();
 	var pp2limit = m_filterSet.pp2limit(limit);