X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmkws-team.js;h=ead2f0311faff02717ca0bcb0f462b732767a3b7;hb=696d1d9e680bfb287e5347134768f5d0e8c10567;hp=e94d31172e5aeacee839ff37ab3b11b3dfd3d1ca;hpb=7dd2b0a563fa5008c43ae10b7fc89ac76822a053;p=mkws-moved-to-github.git diff --git a/src/mkws-team.js b/src/mkws-team.js index e94d311..ead2f03 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 + ']'; }; @@ -43,7 +46,7 @@ function team($, teamName) { 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 +86,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": config.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 +116,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 +150,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 +252,7 @@ function team($, teamName) { function resetPage() { m_currentPage = 1; m_totalRecordCount = 0; + m_gotRecords = false; } that.resetPage = resetPage; @@ -248,7 +260,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 +295,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 +305,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,50 +378,53 @@ function team($, teamName) { function widgetNode(type) { var w = that.widget(type); - return w ? $(w.node) : undefined; + return w ? w.node : undefined; } function renderDetails(data, marker) { var template = loadTemplate("Record"); var details = template(data); - return '