From: Mike Taylor <mike@indexdata.com>
Date: Thu, 24 Apr 2014 10:23:06 +0000 (+0100)
Subject: Switch on filter type, not presence of "id" field.
X-Git-Tag: 1.0.0~859
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=8c494334ac3bd48e7e3c7fe34e5d508cc2e828f5;p=mkws-moved-to-github.git

Switch on filter type, not presence of "id" field.
---

diff --git a/src/mkws-filter.js b/src/mkws-filter.js
index c2bc711..e356217 100644
--- a/src/mkws-filter.js
+++ b/src/mkws-filter.js
@@ -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,7 +47,7 @@ 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;
 	    }