// Some functions are visible as member-functions to be called from
// outside code -- specifically, from generated HTML. These functions
// are that.switchView(), showDetails(), limitTarget(), limitQuery(),
-// delimitTarget(), delimitQuery(), showPage(), pagerPrev(),
-// pagerNext().
+// limitCategory(), delimitTarget(), delimitQuery(), showPage(),
+// pagerPrev(), pagerNext().
//
function team($, teamName) {
var that = {};
var m_query; // initially undefined
var m_sortOrder; // will be set below
var m_perpage; // will be set below
- var m_filters = [];
+ var m_filterSet = filterSet(that);
var m_totalRecordCount = 0;
var m_currentPage = 1;
var m_currentRecordId = '';
};
var m_paz; // will be initialised below
var m_template = {};
- var m_config = Object.create(mkws.config);
+ var m_config = mkws.objectInheritingFrom(mkws.config);
+ var m_widgets = {}; // Maps widget-type to object
that.toString = function() { return '[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_filters; };
+ that.filters = function() { return m_filterSet; };
that.config = function() { return m_config; };
// Accessor methods for individual widgets: writers
// The following PubSub code is modified from the jQuery manual:
- // https://api.jquery.com/jQuery.Callbacks/
+ // http://api.jquery.com/jQuery.Callbacks/
//
// Use as:
// team.queue("eventName").subscribe(function(param1, param2 ...) { ... });
// team.queue("eventName").publish(arg1, arg2, ...);
-
+ //
var queues = {};
function queue(id) {
if (!queues[id]) {
}
function onStat(data) {
- log("stat");
queue("stat").publish(data);
+ if (parseInt(data.activeclients[0], 10) === 0)
+ queue("complete").publish(parseInt(data.hits[0], 10));
}
function onTerm(data) {
that.targetFiltered = function(id) {
- for (var i = 0; i < m_filters.length; i++) {
- if (m_filters[i].id === id ||
- m_filters[i].id === 'pz:id=' + id) {
- return true;
- }
- }
- return false;
+ return m_filterSet.targetFiltered(id);
};
that.limitTarget = function(id, name) {
log("limitTarget(id=" + id + ", name=" + name + ")");
- m_filters.push({ id: id, name: name });
+ m_filterSet.add(filter(id, name));
triggerSearch();
return false;
};
that.limitQuery = function(field, value) {
log("limitQuery(field=" + field + ", value=" + value + ")");
- m_filters.push({ field: field, value: value });
+ m_filterSet.add(filter(null, null, field, value));
triggerSearch();
return false;
};
+ that.limitCategory = function(id) {
+ log("limitCategory(id=" + id + ")");
+ // ### Add a filter
+ // ### triggerSearch() if there's a query
+ return false;
+ };
+
+
that.delimitTarget = function(id) {
log("delimitTarget(id=" + id + ")");
- removeMatchingFilters(function(f) { return f.id });
+ m_filterSet.removeMatching(function(f) { return f.id });
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 });
+ m_filterSet.removeMatching(function(f) { return f.field && field == f.field && value == f.value });
triggerSearch();
return false;
};
- function removeMatchingFilters(matchFn) {
- var newFilters = [];
- for (var i in m_filters) {
- var filter = m_filters[i];
- if (matchFn(filter)) {
- log("removeMatchingFilters() removing filter " + $.toJSON(filter));
- } else {
- log("removeMatchingFilters() keeping filter " + $.toJSON(filter));
- newFilters.push(filter);
- }
- }
- m_filters = newFilters;
- }
-
-
that.showPage = function(pageNum) {
m_currentPage = pageNum;
m_paz.showPage(m_currentPage - 1);
that.reShow = function() {
+ resetPage();
m_paz.show(0, m_perpage, m_sortOrder);
};
that.resetPage = resetPage;
- function newSearch(query, sortOrder, perpage, limit, targets, torusquery) {
+ function newSearch(query, sortOrder, maxrecs, perpage, limit, targets, torusquery) {
log("newSearch: " + query);
if (m_config.use_service_proxy && !mkws.authenticated) {
return;
}
- m_filters = []
- triggerSearch(query, sortOrder, perpage, limit, targets, torusquery);
+ m_filterSet = filterSet(that);
+ triggerSearch(query, sortOrder, maxrecs, perpage, limit, targets, torusquery);
switchView('records'); // In case it's configured to start off as hidden
m_submitted = true;
}
that.newSearch = newSearch;
- function triggerSearch(query, sortOrder, perpage, limit, targets, torusquery) {
+ function triggerSearch(query, sortOrder, maxrecs, perpage, limit, targets, torusquery) {
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_filters.push({ id: targets, name: targets });
- }
+ 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_filters) {
- var filter = m_filters[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;
- } else {
- if (pp2limit)
- pp2limit += ",";
- pp2limit += filter.field + "=" + filter.value.replace(/[\\|,]/g, '\\$&');
- }
- }
+ var pp2filter = m_filterSet.pp2filter();
+ var pp2limit = m_filterSet.pp2limit(limit);
var params = {};
- if (pp2limit) {
- params.limit = pp2limit;
- }
+ 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_filters) + ", " +
+ log("triggerSearch(" + m_query + "): filters = " + $.toJSON(m_filterSet.list()) + ", " +
"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);
}
// switching view between targets and records
function switchView(view) {
- var targets = findnode('.mkwsTargets');
- var results = findnode('.mkwsResults,.mkwsRecords');
- var blanket = findnode('.mkwsBlanket');
- var motd = findnode('.mkwsMOTD');
+ var targets = widgetNode('Targets');
+ var results = widgetNode('Results') || widgetNode('Records');
+ var blanket = widgetNode('Blanket');
+ var motd = widgetNode('MOTD');
switch(view) {
case 'targets':
</tr>\
</table>');
+ var acc = [];
+ var facets = m_config.facets;
+ acc.push('<div class="title">' + M('Termlists') + '</div>');
+ for (var i = 0; i < facets.length; i++) {
+ acc.push('<div class="mkwsFacet mkwsTeam_' + m_teamName + '" data-mkws-facet="' + facets[i] + '">');
+ acc.push('</div>');
+ }
+ findnode(".mkwsTermlists").html(acc.join(''));
+
var ranking_data = '<form name="mkwsSelect" class="mkwsSelect mkwsTeam_' + m_teamName + '" action="" >';
if (m_config.show_sort) {
ranking_data += M('Sort by') + ' ' + mkwsHtmlSort() + ' ';
mkwsHtmlSwitch();
findnode('.mkwsSearchForm').submit(function() {
- var val = findnode('.mkwsQuery').val();
+ var val = widgetNode('Query').val();
newSearch(val);
return false;
});
// on first page, hide the termlist
- $(document).ready(function() { findnode(".mkwsTermlists").hide(); });
+ $(document).ready(function() { widgetNode("Termlists").hide(); });
var container = findnode(".mkwsMOTDContainer");
if (container.length) {
// Move the MOTD from the provided element down into the container
// Finds the node of the specified class within the current team
- // Multiple OR-clauses separated by commas are handled
- // More complex cases may not work
- //
function findnode(selector, teamName) {
teamName = teamName || m_teamName;
- selector = $.map(selector.split(','), function(s, i) {
- return s + '.mkwsTeam_' + teamName;
- }).join(',');
+ if (teamName === 'AUTO') {
+ selector = (selector + '.mkwsTeam_' + teamName + ',' +
+ selector + ':not([class^="mkwsTeam"],[class*=" mkwsTeam"])');
+ } else {
+ selector = selector + '.mkwsTeam_' + teamName;
+ }
var node = $(selector);
//log('findnode(' + selector + ') found ' + node.length + ' nodes');
return node;
}
+ that.findnode = findnode;
+ // This much simpler and more efficient function should be usable
+ // in place of most uses of findnode.
+ function widgetNode(type) {
+ var w = that.widget(type);
+ return w ? $(w.node) : undefined;
+ }
+
function renderDetails(data, marker) {
var template = loadTemplate("Record");
var details = template(data);
if (template === undefined) {
// Fall back to generic template if there is no team-specific one
- var node = findnode(".mkwsTemplate_" + name);
- if (!node.length) {
- node = findnode(".mkwsTemplate_" + name, "ALL");
+ var source;
+ var node = widgetNode("Template_" + name);
+ if (!node) {
+ node = widgetNode("Template_" + name, "ALL");
}
+ if (node) {
+ source = node.html();
+ }
- var source = node.html();
if (!source) {
source = defaultTemplate(name);
}
<span><i>{{md-title-responsibility}}</i></span>\
{{/if}}\
';
+ } else if (name === "Image") {
+ return '\
+ <a href="#" id="{{_id}}" onclick="{{_onclick}}">\
+ {{#first md-thumburl}}\
+ <img src="{{this}}" alt="{{../md-title}}"/>\
+ {{/first}}\
+ <br/>\
+ </a>\
+';
}
var s = "There is no default '" + name +"' template!";
return s;
}
+ that.addWidget = function(w) {
+ if (!m_widgets[w.type]) {
+ m_widgets[w.type] = w;
+ log("Registered '" + w.type + "' widget in team '" + m_teamName + "'");
+ } else if (typeof(m_widgets[w.type]) !== 'number') {
+ m_widgets[w.type] = 2;
+ log("Registered duplicate '" + w.type + "' widget in team '" + m_teamName + "'");
+ } else {
+ m_widgets[w.type] += 1;
+ log("Registered '" + w.type + "' widget #" + m_widgets[w.type] + "' in team '" + m_teamName + "'");
+ }
+ }
+
+ that.widgetTypes = function() {
+ var keys = [];
+ for (var k in m_widgets) keys.push(k);
+ return keys.sort();
+ }
+
+ that.widget = function(type) {
+ return m_widgets[type];
+ }
mkwsHtmlAll()