that.queue = queue;
- function log(s) {
+ function _log(fn, s) {
var now = $.now();
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);
+ fn.call(mkws.log, m_teamName + ": " + timestamp + s);
that.queue("log").publish(m_teamName, timestamp, s);
}
- that.log = log;
+ that.trace = function(x) { _log(mkws.trace, x) };
+ that.debug = function(x) { _log(mkws.debug, x) };
+ that.info = function(x) { _log(mkws.info, x) };
+ that.warn = function(x) { _log(mkws.warn, x) };
+ that.error = function(x) { _log(mkws.error, x) };
+ that.fatal = function(x) { _log(mkws.fatal, x) };
- log("making new widget team");
+ that.info("making new widget team");
m_sortOrder = config.sort_default;
m_perpage = config.perpage_default;
// pz2.js event handlers:
function onInit() {
- log("init");
+ that.info("init");
m_paz.stat();
m_paz.bytarget();
}
function onBytarget(data) {
- log("bytarget");
+ that.info("bytarget");
queue("targets").publish(data);
}
queue("firstrecords").publish(hitcount);
}
if (parseInt(data.activeclients[0], 10) === 0) {
- log("complete");
+ that.info("complete");
queue("complete").publish(hitcount);
}
}
function onTerm(data) {
- log("term");
- queue("termlists").publish(data);
+ that.info("term");
+ queue("facets").publish(data);
}
function onShow(data, teamName) {
- log("show");
+ that.info("show");
m_totalRecordCount = data.merged;
- log("found " + m_totalRecordCount + " records");
+ that.info("found " + m_totalRecordCount + " records");
queue("pager").publish(data);
queue("records").publish(data);
}
function onRecord(data, args, teamName) {
- log("record");
+ that.info("record");
// FIXME: record is async!!
clearTimeout(m_paz.recordTimer);
queue("record").publish(data);
// then register the form submit event with the pz2.search function
// autoInit is set to true on default
that.makePz2 = function() {
- log("m_queues=" + $.toJSON(m_queues));
+ that.debug("m_queues=" + $.toJSON(m_queues));
var params = {
"windowid": teamName,
"pazpar2path": mkws.pazpar2_url(),
params.oninit = onInit;
if (m_queues.targets) {
params.onbytarget = onBytarget;
- log("setting bytarget callback");
+ that.info("setting bytarget callback");
}
- if (m_queues.stat) {
+ if (m_queues.stat || m_queues.firstrecords || m_queues.complete) {
params.onstat = onStat;
- log("setting stat callback");
+ that.info("setting stat callback");
}
- if (m_queues.termlists && config.facets.length) {
+ if (m_queues.facets && config.facets.length) {
params.onterm = onTerm;
- log("setting term callback");
+ that.info("setting term callback");
}
if (m_queues.records) {
- log("setting show callback");
+ that.info("setting show callback");
params.onshow = onShow;
// Record callback is subscribed from records callback
- log("setting record callback");
+ that.info("setting record callback");
params.onrecord = onRecord;
}
m_paz = new pz2(params);
- log("ccreated main pz2 object");
+ that.info("created main pz2 object");
}
// Used by the Records widget and onRecord()
function recordElementId(s) {
- return 'mkwsRec_' + s.replace(/[^a-z0-9]/ig, '_');
+ return 'mkws-rec_' + s.replace(/[^a-z0-9]/ig, '_');
}
that.recordElementId = recordElementId;
// Used by onRecord(), showDetails() and renderDetails()
function recordDetailsId(s) {
- return 'mkwsDet_' + s.replace(/[^a-z0-9]/ig, '_');
+ return 'mkws-det_' + s.replace(/[^a-z0-9]/ig, '_');
}
that.limitTarget = function(id, name) {
- log("limitTarget(id=" + id + ", name=" + name + ")");
+ that.info("limitTarget(id=" + id + ", name=" + name + ")");
m_filterSet.add(targetFilter(id, name));
if (m_query) triggerSearch();
return false;
that.limitQuery = function(field, value) {
- log("limitQuery(field=" + field + ", value=" + value + ")");
+ that.info("limitQuery(field=" + field + ", value=" + value + ")");
m_filterSet.add(fieldFilter(field, value));
if (m_query) triggerSearch();
return false;
that.limitCategory = function(id) {
- log("limitCategory(id=" + id + ")");
+ that.info("limitCategory(id=" + id + ")");
// Only one category filter at a time
m_filterSet.removeMatching(function(f) { return f.type === 'category' });
if (id !== '') m_filterSet.add(categoryFilter(id));
that.delimitTarget = function(id) {
- log("delimitTarget(id=" + id + ")");
+ that.info("delimitTarget(id=" + id + ")");
m_filterSet.removeMatching(function(f) { return f.type === 'target' });
if (m_query) triggerSearch();
return false;
that.delimitQuery = function(field, value) {
- log("delimitQuery(field=" + field + ", value=" + value + ")");
+ that.info("delimitQuery(field=" + field + ", value=" + value + ")");
m_filterSet.removeMatching(function(f) { return f.type == 'field' &&
field == f.field && value == f.value });
if (m_query) triggerSearch();
function newSearch(query, sortOrder, maxrecs, perpage, limit, targets, torusquery) {
- log("newSearch: " + query);
+ that.info("newSearch: " + query);
if (config.use_service_proxy && !mkws.authenticated) {
alert("searching before authentication");
function triggerSearch(query, sortOrder, maxrecs, perpage, limit, targets, torusquery) {
resetPage();
- queue("navi").publish();
// Continue to use previous query/sort-order unless new ones are specified
if (query) m_query = query;
params.torusquery = torusquery;
}
- log("triggerSearch(" + m_query + "): filters = " + m_filterSet.toJSON() + ", " +
+ that.info("triggerSearch(" + m_query + "): filters = " + m_filterSet.toJSON() + ", " +
"pp2filter = " + pp2filter + ", params = " + $.toJSON(params));
m_paz.search(m_query, m_perpage, m_sortOrder, pp2filter, undefined, params);
+ queue("searchtriggered").publish();
}
// fetch record details to be retrieved from the record queue
that.fetchDetails = function(recId) {
- log("fetchDetails() requesting record '" + recId + "'");
+ that.info("fetchDetails() requesting record '" + recId + "'");
m_paz.record(recId);
};
return;
}
// request the record
- log("showDetails() requesting record '" + recId + "'");
+ that.info("showDetails() requesting record '" + recId + "'");
m_paz.record(recId);
};
teamName = teamName || m_teamName;
if (teamName === 'AUTO') {
- selector = (selector + '.mkwsTeam_' + teamName + ',' +
- selector + ':not([class^="mkwsTeam"],[class*=" mkwsTeam"])');
+ selector = (selector + '.mkws-team-' + teamName + ',' +
+ selector + ':not([class^="mkws-team"],[class*=" mkws-team"])');
} else {
- selector = selector + '.mkwsTeam_' + teamName;
+ selector = selector + '.mkws-team-' + teamName;
}
var node = $(selector);
- //log('findnode(' + selector + ') found ' + node.length + ' nodes');
+ //that.debug('findnode(' + selector + ') found ' + node.length + ' nodes');
return node;
}
}
function renderDetails(data, marker) {
- var template = loadTemplate("Record");
+ var template = loadTemplate("details");
var details = template(data);
- return '<div class="mkwsDetails mkwsTeam_' + m_teamName + '" ' +
+ return '<div class="mkws-details mkwsDetails mkwsTeam_' + m_teamName + '" ' +
'id="' + recordDetailsId(data.recid[0]) + '">' + details + '</div>';
}
that.renderDetails = renderDetails;
that.registerTemplate = function(name, text) {
+ if(mkws._old2new.hasOwnProperty(name)) {
+ that.warn("registerTemplate: old widget name: " + name + " => " + mkws._old2new[name]);
+ name = mkws._old2new[name];
+ }
m_templateText[name] = text;
};
function loadTemplate(name, fallbackString) {
+ if(mkws._old2new.hasOwnProperty(name)) {
+ that.warn("loadTemplate: old widget name: " + name + " => " + mkws._old2new[name]);
+ name = mkws._old2new[name];
+ }
+
var template = m_template[name];
if (template === undefined && Handlebars.compile) {
var source;
if (node && node.length < 1) {
node = $(".mkws-template-" + name);
}
- if (node && node.length < 1) {
- node = $(".mkwsTemplate_" + name + " .mkwsTeam_" + that.name());
- }
- if (node && node.length < 1) {
- node = $(".mkwsTemplate_" + name);
- }
if (node) source = node.html();
if (!source) source = m_templateText[name];
if (source) {
template = Handlebars.compile(source);
- log("compiled template '" + name + "'");
+ that.info("compiled template '" + name + "'");
}
}
//if (template === undefined) template = mkws_templatesbyteam[m_teamName][name];
return template;
}
else {
- mkws.log("No MKWS template for " + name);
+ that.info("No MKWS template for " + name);
return null;
}
}
}
}
return undefined;
- }
-
+ };
return that;
};
projects / mkws-moved-to-github.git / blobdiff