X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=src%2Fmkws-team.js;h=8c81a1a857518f444447b963978375174ccba213;hp=54fcfd8d01b0d14f52a90be53521869609440bb2;hb=HEAD;hpb=0152260f89027481ad0c952e1f4115673e9a5237

diff --git a/src/mkws-team.js b/src/mkws-team.js
index 54fcfd8..8c81a1a 100644
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -173,7 +173,7 @@ mkws.makeTeam = function($, teamName) {
       params.onbytarget = onBytarget;
       that.info("setting bytarget callback");
     }
-    if (m_queues.stat) {
+    if (m_queues.stat || m_queues.firstrecords || m_queues.complete) {
       params.onstat = onStat;
       that.info("setting stat callback");
     }
@@ -288,7 +288,7 @@ mkws.makeTeam = function($, teamName) {
   that.resetPage = resetPage;
 
 
-  function newSearch(query, sortOrder, maxrecs, perpage, limit, targets, torusquery) {
+  function newSearch(widget, query, sortOrder, maxrecs, perpage, limit, targets, torusquery) {
     that.info("newSearch: " + query);
 
     if (config.use_service_proxy && !mkws.authenticated) {
@@ -296,6 +296,26 @@ mkws.makeTeam = function($, teamName) {
       return;
     }
 
+    {
+      if (!sortOrder) sortOrder = widget.config.sort;
+      if (!maxrecs) maxrecs = widget.config.maxrecs;
+      if (!perpage) perpage = widget.config.perpage;
+      if (!limit) limit = widget.config.limit;
+      if (!targets) targets = widget.config.targets;
+      if (!torusquery) torusquery = widget.config.targetfilter;
+      var target = widget.config.target;
+      if (target) torusquery = 'udb=="' + target + '"';
+
+      var s = "running search: '" + query + "'";
+      if (sortOrder) s += " sorted by '" + sortOrder + "'";
+      if (maxrecs) s += " restricted to " + maxrecs + " records";
+      if (perpage) s += " with " + perpage + " per page";
+      if (limit) s += " limited by '" + limit + "'";
+      if (targets) s += " in targets '" + targets + "'";
+      if (torusquery) s += " constrained by torusquery '" + torusquery + "'";
+      that.info(s);
+    }
+
     m_filterSet.removeMatching(function(f) { return f.type !== 'category' });
     triggerSearch(query, sortOrder, maxrecs, perpage, limit, targets, torusquery);
     switchView('records'); // In case it's configured to start off as hidden
@@ -306,7 +326,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;
@@ -334,6 +353,7 @@ mkws.makeTeam = function($, teamName) {
         "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
@@ -499,8 +519,7 @@ mkws.makeTeam = function($, teamName) {
       }
     }
     return undefined;
-  }
-
+  };
 
   return that;
 };