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
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;
};
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;
};
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;
};
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;
};
// 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));
- }
+ 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 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);
}