X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-team.js;h=d4bdc8e05f60d47344a585351fa9cbac08f11eba;hb=114a6bad771fb622aa8a82ba162ec9127447a285;hp=6d67c53b6a4028baacd2f905a19bbea7a8fc756c;hpb=cdb0fd7cbeff9883b97d19d49f5c03b3e16f1da3;p=mkws-moved-to-github.git
diff --git a/src/mkws-team.js b/src/mkws-team.js
index 6d67c53..d4bdc8e 100644
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -27,98 +27,118 @@ function team($, teamName) {
};
var m_paz; // will be initialised below
var m_template = {};
+ var m_config = mkws.objectInheritingFrom(mkws.config);
+ that.toString = function() { return '[Team ' + teamName + ']'; };
// Accessor methods for individual widgets: readers
- that.name = function() { return m_teamName; }
- that.submitted = function() { return m_submitted; }
- that.perpage = function() { return m_perpage; }
- that.totalRecordCount = function() { return m_totalRecordCount; }
- 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.name = function() { return m_teamName; };
+ that.submitted = function() { return m_submitted; };
+ that.perpage = function() { return m_perpage; };
+ that.totalRecordCount = function() { return m_totalRecordCount; };
+ 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.config = function() { return m_config; };
// Accessor methods for individual widgets: writers
that.set_sortOrder = function(val) { m_sortOrder = val };
that.set_perpage = function(val) { m_perpage = val };
+ // The following PubSub code is modified from the jQuery manual:
+ // 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]) {
+ var callbacks = $.Callbacks();
+ queues[id] = {
+ publish: callbacks.fire,
+ subscribe: callbacks.add,
+ unsubscribe: callbacks.remove
+ };
+ }
+ return queues[id];
+ };
+ that.queue = queue;
+
+
function log(s) {
var now = $.now();
- var timestamp = ((now - m_logTime.start)/1000).toFixed(3) + " (+" + ((now - m_logTime.last)/1000).toFixed(3) + ") "
+ var timestamp = (((now - m_logTime.start)/1000).toFixed(3) + " (+" +
+ ((now - m_logTime.last)/1000).toFixed(3) + ") ");
m_logTime.last = now;
-
mkws.log(m_teamName + ": " + timestamp + s);
+ that.queue("log").publish(m_teamName, timestamp, s);
}
that.log = log;
+
log("start running MKWS");
- m_sortOrder = mkws_config.sort_default;
- m_perpage = mkws_config.perpage_default;
+ m_sortOrder = m_config.sort_default;
+ m_perpage = m_config.perpage_default;
log("Create main pz2 object");
// create a parameters array and pass it to the pz2's constructor
// then register the form submit event with the pz2.search function
// autoInit is set to true on default
m_paz = new pz2({ "windowid": teamName,
- "pazpar2path": mkws_config.pazpar2_url,
- "usesessions" : mkws_config.use_service_proxy ? false : true,
+ "pazpar2path": m_config.pazpar2_url,
+ "usesessions" : m_config.use_service_proxy ? false : true,
"oninit": onInit,
"onbytarget": onBytarget,
"onstat": onStat,
- "onterm": (mkws_config.facets.length ? onTerm : undefined),
+ "onterm": (m_config.facets.length ? onTerm : undefined),
"onshow": onShow,
"onrecord": onRecord,
"showtime": 500, //each timer (show, stat, term, bytarget) can be specified this way
- "termlist": mkws_config.facets.join(',')
+ "termlist": m_config.facets.join(',')
});
-
- //
// pz2.js event handlers:
- //
function onInit() {
log("init");
m_paz.stat();
m_paz.bytarget();
}
-
function onBytarget(data) {
log("target");
queue("targets").publish(data);
}
-
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) {
log("term");
queue("termlists").publish(data);
}
-
function onShow(data, teamName) {
log("show");
m_totalRecordCount = data.merged;
+ log("found " + m_totalRecordCount + " records");
queue("pager").publish(data);
queue("records").publish(data);
}
-
function onRecord(data, args, teamName) {
log("record");
// FIXME: record is async!!
clearTimeout(m_paz.recordTimer);
- // ##### restrict to current team
- var detRecordDiv = document.getElementById(recordDetailsId(data.recid[0]));
- if (detRecordDiv) {
+ var detRecordDiv = findnode(recordDetailsId(data.recid[0]));
+ if (detRecordDiv.length) {
// in case on_show was faster to redraw element
return;
}
@@ -129,7 +149,7 @@ function team($, teamName) {
}
- // Used by promoteRecords() and onRecord()
+ // Used by the Records widget and onRecord()
function recordElementId(s) {
return 'mkwsRec_' + s.replace(/[^a-z0-9]/ig, '_');
}
@@ -139,7 +159,6 @@ function team($, teamName) {
function recordDetailsId(s) {
return 'mkwsDet_' + s.replace(/[^a-z0-9]/ig, '_');
}
- that.recordElementId = recordElementId;
that.targetFiltered = function(id) {
@@ -150,115 +169,110 @@ function team($, teamName) {
}
}
return false;
- }
-
-
- ////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////////
-
-
- // when search button pressed
- function onFormSubmitEventHandler()
- {
- var val = findnode('.mkwsQuery').val();
- newSearch(val);
- return false;
- }
-
-
- function newSearch(query, sortOrder, targets)
- {
- log("newSearch: " + query);
-
- if (mkws_config.use_service_proxy && !mkws.authenticated) {
- alert("searching before authentication");
- return;
- }
-
- m_filters = []
- triggerSearch(query, sortOrder, targets);
- switchView('records'); // In case it's configured to start off as hidden
- m_submitted = true;
- }
+ };
- // limit by target functions
- that.limitTarget = function (id, name)
- {
+ that.limitTarget = function(id, name) {
log("limitTarget(id=" + id + ", name=" + name + ")");
m_filters.push({ id: id, name: name });
triggerSearch();
return false;
- }
+ };
- // limit the query after clicking the facet
- that.limitQuery = function (field, value)
- {
+ that.limitQuery = function(field, value) {
log("limitQuery(field=" + field + ", value=" + value + ")");
m_filters.push({ field: field, value: value });
triggerSearch();
return false;
- }
+ };
- that.delimitTarget = function (id)
- {
+ that.delimitTarget = function(id) {
log("delimitTarget(id=" + id + ")");
- var newFilters = [];
- for (var i in m_filters) {
- var filter = m_filters[i];
- if (filter.id) {
- log("delimitTarget() removing filter " + $.toJSON(filter));
- } else {
- log("delimitTarget() keeping filter " + $.toJSON(filter));
- newFilters.push(filter);
- }
- }
- m_filters = newFilters;
-
+ removeMatchingFilters(function(f) { return f.id });
triggerSearch();
return false;
- }
+ };
- that.delimitQuery = function (field, value)
- {
+ that.delimitQuery = function(field, value) {
log("delimitQuery(field=" + field + ", value=" + value + ")");
+ removeMatchingFilters(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 (filter.field &&
- field == filter.field &&
- value == filter.value) {
- log("delimitQuery() removing filter " + $.toJSON(filter));
+ if (matchFn(filter)) {
+ log("removeMatchingFilters() removing filter " + $.toJSON(filter));
} else {
- log("delimitQuery() keeping filter " + $.toJSON(filter));
+ log("removeMatchingFilters() keeping filter " + $.toJSON(filter));
newFilters.push(filter);
}
}
m_filters = newFilters;
-
- triggerSearch();
- return false;
}
- function resetPage()
- {
+ that.showPage = function(pageNum) {
+ m_currentPage = pageNum;
+ m_paz.showPage(m_currentPage - 1);
+ };
+
+
+ that.pagerNext = function() {
+ if (m_totalRecordCount - m_perpage*m_currentPage > 0) {
+ m_paz.showNext();
+ m_currentPage++;
+ }
+ };
+
+
+ that.pagerPrev = function() {
+ if (m_paz.showPrev() != false)
+ m_currentPage--;
+ };
+
+
+ that.reShow = function() {
+ m_paz.show(0, m_perpage, m_sortOrder);
+ };
+
+
+ function resetPage() {
m_currentPage = 1;
m_totalRecordCount = 0;
}
that.resetPage = resetPage;
- function triggerSearch (query, sortOrder, targets)
- {
+ function newSearch(query, sortOrder, maxrecs, perpage, limit, targets, torusquery) {
+ log("newSearch: " + query);
+
+ if (m_config.use_service_proxy && !mkws.authenticated) {
+ alert("searching before authentication");
+ return;
+ }
+
+ m_filters = []
+ 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, maxrecs, perpage, limit, targets, torusquery) {
resetPage();
queue("navi").publish();
var pp2filter = "";
- var pp2limit = "";
+ var pp2limit = limit || "";
// Continue to use previous query/sort-order unless new ones are specified
if (query) {
@@ -267,6 +281,9 @@ function team($, teamName) {
if (sortOrder) {
m_sortOrder = sortOrder;
}
+ if (perpage) {
+ m_perpage = perpage;
+ }
if (targets) {
m_filters.push({ id: targets, name: targets });
}
@@ -293,8 +310,17 @@ function team($, teamName) {
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) + ", pp2filter = " + pp2filter + ", params = " + $.toJSON(params));
+ log("triggerSearch(" + m_query + "): filters = " + $.toJSON(m_filters) + ", " +
+ "pp2filter = " + pp2filter + ", params = " + $.toJSON(params));
// We can use: params.torusquery = "udb=NAME"
// Note: that won't work when running against raw pazpar2
@@ -302,33 +328,6 @@ function team($, teamName) {
}
- that.reShow = function() {
- m_paz.show(0, m_perpage, m_sortOrder);
- }
-
-
- that.showPage = function (pageNum)
- {
- m_currentPage = pageNum;
- m_paz.showPage(m_currentPage - 1);
- }
-
-
- // simple paging functions
- that.pagerNext = function () {
- if (m_totalRecordCount - m_perpage*m_currentPage > 0) {
- m_paz.showNext();
- m_currentPage++;
- }
- }
-
-
- that.pagerPrev = function () {
- if (m_paz.showPrev() != false)
- m_currentPage--;
- }
-
-
// switching view between targets and records
function switchView(view) {
var targets = findnode('.mkwsTargets');
@@ -364,16 +363,12 @@ function team($, teamName) {
// detailed record drawing
- that.showDetails = function (recId) {
+ that.showDetails = function(recId) {
var oldRecordId = m_currentRecordId;
m_currentRecordId = recId;
// remove current detailed view if any
- // ##### restrict to current team
- var detRecordDiv = document.getElementById(recordDetailsId(oldRecordId));
- // lovin DOM!
- if (detRecordDiv)
- detRecordDiv.parentNode.removeChild(detRecordDiv);
+ findnode('#' + recordDetailsId(oldRecordId)).remove();
// if the same clicked, just hide
if (recId == oldRecordId) {
@@ -384,7 +379,7 @@ function team($, teamName) {
// request the record
log("showDetails() requesting record '" + recId + "'");
m_paz.record(recId);
- }
+ };
/*
@@ -393,13 +388,13 @@ function team($, teamName) {
*/
function mkwsHtmlAll() {
mkwsSetLang();
- if (mkws_config.show_lang)
+ if (m_config.show_lang)
mkwsHtmlLang();
log("HTML search form");
findnode('.mkwsSearch').html('\
');
@@ -433,11 +428,20 @@ function team($, teamName) {
\
');
+ var acc = [];
+ var facets = m_config.facets;
+ acc.push('' + M('Termlists') + '
');
+ for (var i = 0; i < facets.length; i++) {
+ acc.push('');
+ acc.push('
');
+ }
+ findnode(".mkwsTermlists").html(acc.join(''));
+
var ranking_data = '';
@@ -445,7 +449,11 @@ function team($, teamName) {
mkwsHtmlSwitch();
- findnode('.mkwsSearchForm').submit(onFormSubmitEventHandler);
+ findnode('.mkwsSearchForm').submit(function() {
+ var val = findnode('.mkwsQuery').val();
+ newSearch(val);
+ return false;
+ });
// on first page, hide the termlist
$(document).ready(function() { findnode(".mkwsTermlists").hide(); });
@@ -458,26 +466,26 @@ function team($, teamName) {
function mkwsSetLang() {
- var lang = getParameterByName("lang") || mkws_config.lang;
+ var lang = mkws.getParameterByName("lang") || m_config.lang;
if (!lang || !mkws.locale_lang[lang]) {
- mkws_config.lang = ""
+ m_config.lang = ""
} else {
- mkws_config.lang = lang;
+ m_config.lang = lang;
}
- log("Locale language: " + (mkws_config.lang ? mkws_config.lang : "none"));
- return mkws_config.lang;
+ log("Locale language: " + (m_config.lang ? m_config.lang : "none"));
+ return m_config.lang;
}
/* create locale language menu */
function mkwsHtmlLang() {
var lang_default = "en";
- var lang = mkws_config.lang || lang_default;
+ var lang = m_config.lang || lang_default;
var list = [];
/* display a list of configured languages, or all */
- var lang_options = mkws_config.lang_options || [];
+ var lang_options = m_config.lang_options || [];
var toBeIncluded = {};
for (var i = 0; i < lang_options.length; i++) {
toBeIncluded[lang_options[i]] = true;
@@ -517,8 +525,8 @@ function team($, teamName) {
log("HTML sort, m_sortOrder = '" + m_sortOrder + "'");
var sort_html = '