X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=src%2Fmkws-team.js;h=d5f8bc0c7f1c2fdd05e0bbb2ea5dd145e8e89c10;hp=90b73915333352c05f0b5038f84ddeb3e641ba2c;hb=d1cc4e416a295d7980eb79dbce50d3fe51cdf84b;hpb=f9d6d25a5fbc82c27e63ca020ee497eac62d7cc4 diff --git a/src/mkws-team.js b/src/mkws-team.js index 90b7391..d5f8bc0 100644 --- a/src/mkws-team.js +++ b/src/mkws-team.js @@ -33,6 +33,7 @@ mkws.makeTeam = function($, teamName) { var m_template = {}; // compiled templates, from any source var m_widgets = {}; // Maps widget-type to array of widget objects var m_gotRecords = false; + var m_targetMap = {}; // Maps target ID to human-readable name var config = mkws.objectInheritingFrom(mkws.config); that.config = config; @@ -79,31 +80,36 @@ mkws.makeTeam = function($, teamName) { 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); } @@ -115,26 +121,26 @@ mkws.makeTeam = function($, teamName) { 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); @@ -154,7 +160,7 @@ mkws.makeTeam = function($, teamName) { // 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(), @@ -166,26 +172,26 @@ mkws.makeTeam = function($, teamName) { 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("created main pz2 object"); + that.info("created main pz2 object"); } @@ -207,7 +213,7 @@ mkws.makeTeam = function($, teamName) { 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; @@ -215,7 +221,7 @@ mkws.makeTeam = function($, teamName) { 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; @@ -223,7 +229,7 @@ mkws.makeTeam = function($, teamName) { 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)); @@ -233,7 +239,7 @@ mkws.makeTeam = function($, teamName) { 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; @@ -241,7 +247,7 @@ mkws.makeTeam = function($, teamName) { 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(); @@ -284,7 +290,7 @@ mkws.makeTeam = function($, teamName) { 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"); @@ -301,7 +307,6 @@ mkws.makeTeam = function($, teamName) { 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; @@ -325,15 +330,16 @@ mkws.makeTeam = function($, teamName) { 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); }; @@ -380,7 +386,7 @@ mkws.makeTeam = function($, teamName) { return; } // request the record - log("showDetails() requesting record '" + recId + "'"); + that.info("showDetails() requesting record '" + recId + "'"); m_paz.record(recId); }; @@ -397,7 +403,7 @@ mkws.makeTeam = function($, teamName) { } var node = $(selector); - //log('findnode(' + selector + ') found ' + node.length + ' nodes'); + //that.debug('findnode(' + selector + ') found ' + node.length + ' nodes'); return node; } @@ -408,7 +414,7 @@ mkws.makeTeam = function($, teamName) { } function renderDetails(data, marker) { - var template = loadTemplate("Record"); + var template = loadTemplate("details"); var details = template(data); return '
' + details + '
'; @@ -418,7 +424,7 @@ mkws.makeTeam = function($, teamName) { that.registerTemplate = function(name, text) { if(mkws._old2new.hasOwnProperty(name)) { - mkws.log("Warning: registerTemplate old widget name: " + name + " => " + mkws._old2new[name]); + that.warn("registerTemplate: old widget name: " + name + " => " + mkws._old2new[name]); name = mkws._old2new[name]; } m_templateText[name] = text; @@ -427,7 +433,7 @@ mkws.makeTeam = function($, teamName) { function loadTemplate(name, fallbackString) { if(mkws._old2new.hasOwnProperty(name)) { - mkws.log("Warning loadTemplate: old widget name: " + name + " => " + mkws._old2new[name]); + that.warn("loadTemplate: old widget name: " + name + " => " + mkws._old2new[name]); name = mkws._old2new[name]; } @@ -438,17 +444,11 @@ mkws.makeTeam = function($, teamName) { if (node && node.length < 1) { node = $(".mkws-template-" + name); } - if (node && node.length < 1) { - node = $(".mkws-template_" + name + " .mkws-team-" + that.name()); - } - if (node && node.length < 1) { - node = $(".mkws-template_" + 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]; @@ -463,7 +463,7 @@ mkws.makeTeam = function($, teamName) { return template; } else { - log("No MKWS template for " + name); + that.info("No MKWS template for " + name); return null; } } @@ -500,8 +500,19 @@ mkws.makeTeam = function($, teamName) { } } return undefined; - } + }; + that.mapTarget = function(id, name) { + var old = m_targetMap[id]; + m_targetMap[id] = name; + if (old && name !== old) { + that.warn("targetMap for id '" + id + "' changed from '" + old + "' to '" + name + "'"); + } + }; + + that.targetName = function(id) { + return m_targetMap[id] || id; + } return that; };