X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-team.js;h=08f67b390070a236215c90847fd1f10bf595374d;hb=04ee68fc68554df39378fc1b67ad403b880bb2e9;hp=91a411cbc7f356dfdd5bf30306a61b326507d4a0;hpb=1221dbafb11bc0e4479cf82b4288d73e4653dedd;p=mkws-moved-to-github.git

diff --git a/src/mkws-team.js b/src/mkws-team.js
index 91a411c..08f67b3 100644
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -15,7 +15,7 @@ function team($, teamName) {
     var m_query; // initially undefined
     var m_sortOrder; // will be set below
     var m_perpage; // will be set below
-    var m_filterSet = filterSet();
+    var m_filterSet = filterSet(that);
     var m_totalRecordCount = 0;
     var m_currentPage = 1;
     var m_currentRecordId = '';
@@ -40,7 +40,7 @@ function team($, teamName) {
     that.currentPage = function() { return m_currentPage; };
     that.currentRecordId = function() { return m_currentRecordId; };
     that.currentRecordData = function() { return m_currentRecordData; };
-    that.filters = function() { return m_filterSet.list(); };
+    that.filters = function() { return m_filterSet; };
     that.config = function() { return m_config; };
 
     // Accessor methods for individual widgets: writers
@@ -169,62 +169,47 @@ function team($, teamName) {
 
     that.limitTarget = function(id, name) {
 	log("limitTarget(id=" + id + ", name=" + name + ")");
-	m_filterSet.add(filter(id, name));
-	triggerSearch();
+	m_filterSet.add(targetFilter(id, name));
+	if (m_query) triggerSearch();
 	return false;
     };
 
 
     that.limitQuery = function(field, value) {
 	log("limitQuery(field=" + field + ", value=" + value + ")");
-	m_filterSet.add(filter(null, null, field, value));
-	triggerSearch();
+	m_filterSet.add(fieldFilter(field, value));
+        if (m_query) triggerSearch();
 	return false;
     };
 
 
     that.limitCategory = function(id) {
 	log("limitCategory(id=" + id + ")");
-	// ### Add a filter
-	// ### triggerSearch() if there's a query
+        // Only one category filter at a time
+	m_filterSet.removeMatching(function(f) { return f.type === 'category' });        
+        if (id !== '') m_filterSet.add(categoryFilter(id));
+        if (m_query) triggerSearch();
 	return false;
     };
 
 
     that.delimitTarget = function(id) {
 	log("delimitTarget(id=" + id + ")");
-	removeMatchingFilters(function(f) { return f.id });
-	triggerSearch();
+	m_filterSet.removeMatching(function(f) { return f.type === 'target' });
+        if (m_query) triggerSearch();
 	return false;
     };
 
 
     that.delimitQuery = function(field, value) {
 	log("delimitQuery(field=" + field + ", value=" + value + ")");
-	removeMatchingFilters(function(f) { return f.field && field == f.field && value == f.value });
-	triggerSearch();
+	m_filterSet.removeMatching(function(f) { return f.type == 'field' &&
+                                                 field == f.field && value == f.value });
+        if (m_query) triggerSearch();
 	return false;
     };
 
 
-    function removeMatchingFilters(matchFn) {
-	var newFilters = [];
-	for (var i in m_filterSet.list()) {
-	    var filter = m_filterSet.list()[i];
-	    if (matchFn(filter)) {
-		log("removeMatchingFilters() removing filter " + $.toJSON(filter));
-	    } else {
-		log("removeMatchingFilters() keeping filter " + $.toJSON(filter));
-		newFilters.push(filter);
-	    }
-	}
-	m_filterSet = filterSet();
-	for (var i = 0; i < newFilters.length; i++) {
-	    m_filterSet.add(newFilters[i]);
-	}
-    }
-
-
     that.showPage = function(pageNum) {
 	m_currentPage = pageNum;
 	m_paz.showPage(m_currentPage - 1);
@@ -266,7 +251,7 @@ function team($, teamName) {
 	    return;
 	}
 
-	m_filterSet = filterSet();
+	m_filterSet.removeMatching(function(f) { return f.type !== 'category' });
 	triggerSearch(query, sortOrder, maxrecs, perpage, limit, targets, torusquery);
 	switchView('records'); // In case it's configured to start off as hidden
 	m_submitted = true;
@@ -278,63 +263,31 @@ function team($, teamName) {
 	resetPage();
 	queue("navi").publish();
 
-	var pp2filter = "";
-	var pp2limit = limit || "";
-
 	// Continue to use previous query/sort-order unless new ones are specified
-	if (query) {
-	    m_query = query;
-	}
-	if (sortOrder) {
-	    m_sortOrder = sortOrder;
-	}
-	if (perpage) {
-	    m_perpage = perpage;
-	}
-	if (targets) {
-	    m_filterSet.add(filter(id, id));
-	}
-
-	for (var i in m_filterSet.list()) {
-	    var filter = m_filterSet.list()[i];
-	    if (filter.id) {
-		if (pp2filter)
-		    pp2filter += ",";
-		if (filter.id.match(/^[a-z:]+[=~]/)) {
-		    log("filter '" + filter.id + "' already begins with SETTING OP");
-		} else {
-		    filter.id = 'pz:id=' + filter.id;
-		}
-		pp2filter += filter.id;
-	    }
-	}
-	for (var i in m_filterSet.list()) {
-	    var filter = m_filterSet.list()[i];
-	    if (!filter.id) {
-		if (pp2limit)
-		    pp2limit += ",";
-		pp2limit += filter.field + "=" + filter.value.replace(/[\\|,]/g, '\\$&');
-	    }
-	}
+	if (query) m_query = query;
+	if (sortOrder) m_sortOrder = sortOrder;
+	if (perpage) m_perpage = perpage;
+	if (targets) m_filterSet.add(targetFilter(id, id));
+
+	var pp2filter = m_filterSet.pp2filter();
+	var pp2limit = m_filterSet.pp2limit(limit);
+        var pp2catLimit = m_filterSet.pp2catLimit();
+	if (pp2catLimit) {
+            pp2filter = pp2filter ? pp2filter + "," + pp2catLimit : pp2catLimit;
+        }
 
 	var params = {};
-	if (pp2limit) {
-	    params.limit = pp2limit;
-	}
-	if (maxrecs) {
-	    params.maxrecs = maxrecs;
-	}
+	if (pp2limit) params.limit = pp2limit;
+	if (maxrecs) params.maxrecs = maxrecs;
 	if (torusquery) {
 	    if (!mkws.config.use_service_proxy)
 		alert("can't narrow search by torusquery when Service Proxy is not in use");
 	    params.torusquery = torusquery;
 	}
 
-	log("triggerSearch(" + m_query + "): filters = " + $.toJSON(m_filterSet.list()) + ", " +
+	log("triggerSearch(" + m_query + "): filters = " + m_filterSet.toJSON() + ", " +
 	    "pp2filter = " + pp2filter + ", params = " + $.toJSON(params));
 
-	// We can use: params.torusquery = "udb=NAME"
-	// Note: that won't work when running against raw pazpar2
 	m_paz.search(m_query, m_perpage, m_sortOrder, pp2filter, undefined, params);
     }