X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-widgets.js;h=551527ca97632e1a7cf82601c3c34e6eeb5a3d3e;hb=bcf5b06441c4bea837ab3af5f72feb8ecf6277ab;hp=79e83eb39992ea305b36688e7fec70a3ae023975;hpb=d4dacd0215f4f025cd15202f0aeb3ec5ccfc35fd;p=mkws-moved-to-github.git

diff --git a/src/mkws-widgets.js b/src/mkws-widgets.js
index 79e83eb..551527c 100644
--- a/src/mkws-widgets.js
+++ b/src/mkws-widgets.js
@@ -59,12 +59,8 @@ function widget($, team, type, node) {
 }
 
 
-// This is a utility function that can be used by all widgets that can
-// invoke an autosearch. It properly belongs to the widget superclass,
-// but since there are no classes in JavaScript there's no scope for
-// it to live in, hence its being put into the mkws object.
-
-mkws.maybeAutosearch = function(widget) {
+// Utility function for use by all widgets that can invoke autosearch.
+widget.autosearch = function(widget) {
     var query = widget.config.autosearch;
     if (query) {
 	if (query.match(/^!param!/)) {
@@ -86,19 +82,24 @@ mkws.maybeAutosearch = function(widget) {
 
 	widget.team.queue("ready").subscribe(function() {
 	    var sortOrder = widget.config.sort;
+	    var maxrecs = widget.config.maxrecs;
 	    var perpage = widget.config.perpage;
 	    var limit = widget.config.limit;
 	    var targets = widget.config.targets;
 	    var targetfilter = widget.config.targetfilter;
+	    var target = widget.config.target;
+	    if (target) targetfilter = 'udb=="' + target + '"';
+
 	    var s = "running auto 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 (targetfilter) s += " constrained by targetfilter '" + targetfilter + "'";
 	    widget.log(s);
 
-	    widget.team.newSearch(query, sortOrder, perpage, limit, targets, targetfilter);
+	    widget.team.newSearch(query, sortOrder, maxrecs, perpage, limit, targets, targetfilter);
 	});
     }
 };
@@ -215,6 +216,8 @@ mkws.registerWidgetType('Termlists', function() {
 	    acc.push('</div>');
 	}
     });
+
+    widget.autosearch(that);
 });
 
 
@@ -303,14 +306,14 @@ mkws.registerWidgetType('Records', function() {
 	$(that.node).html(html.join(''));
 
 	function renderSummary(hit) {
-	    var template = team.loadTemplate("Summary");
+	    var template = team.loadTemplate(that.config.template || "Summary");
 	    hit._id = team.recordElementId(hit.recid[0]);
 	    hit._onclick = "mkws.showDetails('" + team.name() + "', '" + hit.recid[0] + "');return false;"
 	    return template(hit);
 	}
     });
 
-    mkws.maybeAutosearch(that);
+    widget.autosearch(that);
 });