X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=src%2Fmkws-team.js;h=92536f197c41f10296d8335bf46f99d0393fe25f;hp=8b99685c9dfbfa2917d23d492f2f1389e7cc3f10;hb=8ecc7b5621fa3f7191205e6ce93a8ef097e873bd;hpb=78a3759a52fca2ca77d6b8023bb03ec705a3e1b0 diff --git a/src/mkws-team.js b/src/mkws-team.js index 8b99685..92536f1 100644 --- a/src/mkws-team.js +++ b/src/mkws-team.js @@ -26,10 +26,13 @@ function team($, teamName) { "last": $.now() }; var m_paz; // will be initialised below - var m_tempateText = {}; // widgets can register tempates to be compiled + var m_templateText = {}; // widgets can register templates to be compiled var m_template = {}; // compiled templates, from any source - var m_config = mkws.objectInheritingFrom(mkws.config); var m_widgets = {}; // Maps widget-type to array of widget objects + var m_gotRecords = false; + + var config = mkws.objectInheritingFrom(mkws.config); + that.config = config; that.toString = function() { return '[Team ' + teamName + ']'; }; @@ -38,12 +41,13 @@ function team($, teamName) { that.submitted = function() { return m_submitted; }; that.sortOrder = function() { return m_sortOrder; }; that.perpage = function() { return m_perpage; }; + that.query = function() { return m_query; }; 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_filterSet; }; - that.config = function() { return m_config; }; + that.gotRecords = function() { return m_gotRecords; }; // Accessor methods for individual widgets: writers that.set_sortOrder = function(val) { m_sortOrder = val }; @@ -83,27 +87,27 @@ function team($, teamName) { that.log = log; - log("start running MKWS"); + log("making new widget team"); - m_sortOrder = m_config.sort_default; - m_perpage = m_config.perpage_default; + m_sortOrder = config.sort_default; + m_perpage = 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": m_config.pazpar2_url, - "usesessions" : m_config.use_service_proxy ? false : true, + "pazpar2path": mkws.pazpar2_url(), + "usesessions" : config.use_service_proxy ? false : true, "oninit": onInit, "onbytarget": onBytarget, "onstat": onStat, - "onterm": (m_config.facets.length ? onTerm : undefined), + "onterm": (config.facets.length ? onTerm : undefined), "onshow": onShow, "onrecord": onRecord, "showtime": 500, //each timer (show, stat, term, bytarget) can be specified this way - "termlist": m_config.facets.join(',') + "termlist": config.facets.join(',') }); + log("created main pz2 object"); // pz2.js event handlers: function onInit() { @@ -113,14 +117,21 @@ function team($, teamName) { } function onBytarget(data) { - log("target"); + log("bytarget"); queue("targets").publish(data); } function onStat(data) { queue("stat").publish(data); - if (parseInt(data.activeclients[0], 10) === 0) - queue("complete").publish(parseInt(data.hits[0], 10)); + var hitcount = parseInt(data.hits[0], 10); + if (!m_gotRecords && hitcount > 0) { + m_gotRecords = true; + queue("firstrecords").publish(hitcount); + } + if (parseInt(data.activeclients[0], 10) === 0) { + log("complete"); + queue("complete").publish(hitcount); + } } function onTerm(data) { @@ -140,6 +151,7 @@ function team($, teamName) { log("record"); // FIXME: record is async!! clearTimeout(m_paz.recordTimer); + queue("record").publish(data); var detRecordDiv = findnode(recordDetailsId(data.recid[0])); if (detRecordDiv.length) { // in case on_show was faster to redraw element @@ -241,6 +253,7 @@ function team($, teamName) { function resetPage() { m_currentPage = 1; m_totalRecordCount = 0; + m_gotRecords = false; } that.resetPage = resetPage; @@ -248,7 +261,7 @@ function team($, teamName) { function newSearch(query, sortOrder, maxrecs, perpage, limit, targets, torusquery) { log("newSearch: " + query); - if (m_config.use_service_proxy && !mkws.authenticated) { + if (config.use_service_proxy && !mkws.authenticated) { alert("searching before authentication"); return; } @@ -283,7 +296,7 @@ function team($, teamName) { 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"); + alert("can't narrow search by torusquery when not authenticated"); params.torusquery = torusquery; } @@ -293,6 +306,12 @@ function team($, teamName) { m_paz.search(m_query, m_perpage, m_sortOrder, pp2filter, undefined, params); } + // fetch record details to be retrieved from the record queue + that.fetchDetails = function(recId) { + log("fetchDetails() requesting record '" + recId + "'"); + m_paz.record(recId); + }; + // switching view between targets and records function switchView(view) { @@ -360,7 +379,7 @@ function team($, teamName) { function widgetNode(type) { var w = that.widget(type); - return w ? w.jqnode : undefined; + return w ? w.node : undefined; } function renderDetails(data, marker) { @@ -373,37 +392,40 @@ function team($, teamName) { that.registerTemplate = function(name, text) { - m_tempateText[name] = text; + m_templateText[name] = text; }; - function loadTemplate(name) { + function loadTemplate(name, fallbackString) { var template = m_template[name]; - - if (template === undefined) { - // Fall back to generic template if there is no team-specific one + if (template === undefined && Handlebars.compile) { var source; - var node = widgetNode("Template_" + name); - if (!node) { - node = widgetNode("Template_" + name, "ALL"); - } - if (node) { - source = node.html(); + var node = $(".mkwsTemplate_" + name + " .mkwsTeam_" + that.name()); + if (node && node.length < 1) { + node = $(".mkwsTemplate_" + name); } - - if (!source) { - source = m_tempateText[name]; - } - if (!source) { - source = mkws.defaultTemplate(name); + if (node) source = node.html(); + if (!source) source = m_templateText[name]; + if (source) { + template = Handlebars.compile(source); + log("compiled template '" + name + "'"); } - - template = Handlebars.compile(source); - log("compiled template '" + name + "'"); + } + //if (template === undefined) template = mkws_templatesbyteam[m_teamName][name]; + if (template === undefined && Handlebars.templates) { + template = Handlebars.templates[name]; + } + if (template === undefined && mkws.defaultTemplates) { + template = mkws.defaultTemplates[name]; + } + if (template) { m_template[name] = template; + return template; } - - return template; + else { + mkws.log("No MKWS template for " + name); + return null; + } } that.loadTemplate = loadTemplate; @@ -411,10 +433,8 @@ function team($, teamName) { that.addWidget = function(w) { if (m_widgets[w.type] === undefined) { m_widgets[w.type] = [ w ]; - log("Added '" + w.type + "' widget to team '" + m_teamName + "'"); } else { m_widgets[w.type].push(w); - log("Added '" + w.type + "' widget #" + m_widgets[w.type].length + "' to team '" + m_teamName + "'"); } }