X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-widgets.js;h=98a48bde67a9f30d60e8afb2f5e193063fb60b3d;hb=7fab550372b8ca7430c7d27e8ed8bdd10ea729ee;hp=7f218be545beb4f65c100766fd07258b00f51b74;hpb=d26ab9999daa36225232281061ab1f7ef3c1d02f;p=mkws-moved-to-github.git

diff --git a/src/mkws-widgets.js b/src/mkws-widgets.js
index 7f218be..98a48bd 100644
--- a/src/mkws-widgets.js
+++ b/src/mkws-widgets.js
@@ -60,43 +60,48 @@ function widget($, team, type, node) {
 
 
 // Utility function for use by all widgets that can invoke autosearch.
-widget.maybeAutosearch = function(widget) {
-    var query = widget.config.autosearch;
-    if (query) {
-	if (query.match(/^!param!/)) {
-	    var param = query.replace(/^!param!/, '');
-	    query = mkws.getParameterByName(param);
-	    widget.log("obtained query '" + query + "' from param '" + param + "'");
-	    if (!query) {
-		alert("This page has a MasterKey widget that needs a query specified by the '" + param + "' parameter");
-	    }
-	} else if (query.match(/^!path!/)) {
-	    var index = query.replace(/^!path!/, '');
-	    var path = window.location.pathname.split('/');
-	    query = path[path.length - index];
-	    widget.log("obtained query '" + query + "' from path-component '" + index + "'");
-	    if (!query) {
-		alert("This page has a MasterKey widget that needs a query specified by the path-component " + index);
+widget.autosearch = function(widget) {
+    widget.team.queue("ready").subscribe(function() {
+	var query = widget.config.autosearch;
+	if (query) {
+	    if (query.match(/^!param!/)) {
+		var param = query.replace(/^!param!/, '');
+		query = mkws.getParameterByName(param);
+		widget.log("obtained query '" + query + "' from param '" + param + "'");
+		if (!query) {
+		    alert("This page has a MasterKey widget that needs a query specified by the '" + param + "' parameter");
+		}
+	    } else if (query.match(/^!path!/)) {
+		var index = query.replace(/^!path!/, '');
+		var path = window.location.pathname.split('/');
+		query = path[path.length - index];
+		widget.log("obtained query '" + query + "' from path-component '" + index + "'");
+		if (!query) {
+		    alert("This page has a MasterKey widget that needs a query specified by the path-component " + index);
+		}
 	    }
-	}
 
-	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);
+	}
+    });
 };
 
 
@@ -211,6 +216,8 @@ mkws.registerWidgetType('Termlists', function() {
 	    acc.push('</div>');
 	}
     });
+
+    widget.autosearch(that);
 });
 
 
@@ -299,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);
 	}
     });
 
-    widget.maybeAutosearch(that);
+    widget.autosearch(that);
 });