that.limitTarget = function(id, name) {
log("limitTarget(id=" + id + ", name=" + name + ")");
m_filterSet.add(targetFilter(id, name));
- triggerSearch();
+ if (m_query) triggerSearch();
return false;
};
that.limitQuery = function(field, value) {
log("limitQuery(field=" + field + ", value=" + value + ")");
m_filterSet.add(fieldFilter(field, value));
- triggerSearch();
+ 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 + ")");
m_filterSet.removeMatching(function(f) { return f.type === 'target' });
- triggerSearch();
+ if (m_query) triggerSearch();
return false;
};
log("delimitQuery(field=" + field + ", value=" + value + ")");
m_filterSet.removeMatching(function(f) { return f.type == 'field' &&
field == f.field && value == f.value });
- triggerSearch();
+ if (m_query) triggerSearch();
return false;
};
return;
}
- m_filterSet = filterSet(that);
+ 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;
resetPage();
queue("navi").publish();
-
// Continue to use previous query/sort-order unless new ones are specified
if (query) m_query = query;
if (sortOrder) m_sortOrder = sortOrder;
var pp2filter = m_filterSet.pp2filter();
var pp2limit = m_filterSet.pp2limit(limit);
+ var pp2catLimit = m_filterSet.pp2catLimit();
var params = {};
if (pp2limit) params.limit = pp2limit;
+ if (pp2catLimit) params.categoryfilter = pp2catLimit;
if (maxrecs) params.maxrecs = maxrecs;
if (torusquery) {
if (!mkws.config.use_service_proxy)