Check for whether "torusquery" can be used is against whether MKWS has

[mkws-moved-to-github.git] / src / mkws-team.js

diff --git a/src/mkws-team.js b/src/mkws-team.js
index 519fd7e..9abed73 100644 (file)
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -28,8 +28,11 @@ function team($, teamName) {
   var m_paz; // will be initialised below
   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,6 @@ 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; };
 
   // Accessor methods for individual widgets: writers
   that.set_sortOrder = function(val) { m_sortOrder = val };
@@ -85,23 +87,23 @@ function team($, teamName) {
 
   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;
 
   // 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");
 
@@ -119,8 +121,15 @@ function team($, teamName) {
 
   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) {
@@ -241,6 +250,7 @@ function team($, teamName) {
   function resetPage() {
     m_currentPage = 1;
     m_totalRecordCount = 0;
+    m_gotRecords = false;
   }
   that.resetPage = resetPage;
 
@@ -248,7 +258,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 +293,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;
     }
 
@@ -377,7 +387,7 @@ function team($, teamName) {
   };
 
 
-  function loadTemplate(name) {
+  function loadTemplate(name, fallbackString) {
     var template = m_template[name];
 
     if (template === undefined) {
@@ -391,13 +401,20 @@ function team($, teamName) {
         source = node.html();
       }
 
+      // If the template is not defined in HTML, check the following
+      // in order: template registered in the team by a widget;
+      // fallback string provided on this invocation; global default.
       if (!source) {
         source = m_templateText[name];
       }
       if (!source) {
+        source = fallbackString;
+      }
+      if (!source) {
         source = mkws.defaultTemplate(name);
       }
 
+      if (!source) return null;
       template = Handlebars.compile(source);
       log("compiled template '" + name + "'");
       m_template[name] = template;