X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=539f2bf50dc4a773c24779e36bf3914d6c60d2ff;hb=c79a20e709ad2dace476db0a54351002b644d223;hp=0e7902ef6c5c7ee5d2e20c32ed43e46b9ade0d90;hpb=164986f479920f5a1022ad9746e6d45e67f88e6c;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 0e7902e..539f2bf 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -824,7 +824,8 @@ function team($, teamName) {
     <td>\
       {{#first location having="md-subject"}}\
 	{{#if md-subject}}\
-	  {{md-subject}}\
+	  {{#commaList md-subject}}\
+	    {{this}}{{/commaList}}\
 	{{/if}}\
       {{/first}}\
     </td>\
@@ -1093,6 +1094,43 @@ function team($, teamName) {
     }
 
 
+    that.run_auto_search = function() {
+	// ### should check mkwsTermlist as well, for facet-only teams
+	var node = $('.mkwsRecords.mkwsTeam_' + m_teamName);
+	var query = node.attr('autosearch');
+	if (!query)
+	    return;
+
+	if (query.match(/^!param!/)) {
+	    var param = query.replace(/^!param!/, '');
+	    query = getParameterByName(param);
+	    debug("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];
+	    debug("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);
+	    }
+	}
+
+	debug("node=" + node + ", class='" + node.className + "', query=" + query);
+
+	var sort = node.attr('sort');
+	var targets = node.attr('targets');
+	var s = "running auto search: '" + query + "'";
+	if (sort) s += " sorted by '" + sort + "'";
+	if (targets) s += " in targets '" + targets + "'";
+	debug(s);
+
+	this.newSearch(query, sort, targets, m_teamName);
+    }
+
+
     /* locale */
     function M(word) {
 	var lang = mkws_config.lang;
@@ -1312,41 +1350,7 @@ function team($, teamName) {
 	debug("running auto searches");
 
 	for (var teamName in mkws.teams) {
-	    // ### should check mkwsTermlist as well, for facet-only teams
-	    var node = $('.mkwsRecords.mkwsTeam_' + teamName);
-	    var query = node.attr('autosearch');
-
-	    if (query.match(/^!param!/)) {
-		var param = query.replace(/^!param!/, '');
-		query = getParameterByName(param);
-		debug("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];
-		debug("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);
-		}
-	    }
-
-	    debug("teamName '" + teamName + "', node=" + node + ", class='" + node.className + "', query=" + query);
-
-	    if (query) {
-		var sort = node.attr('sort');
-		var targets = node.attr('targets');
-		var s = "running auto search: '" + query + "'";
-		if (teamName) s += " [teamName '" + teamName + "']";
-		if (sort) s += " sorted by '" + sort + "'";
-		if (targets) s += " in targets '" + targets + "'";
-		debug(s);
-		var team = mkws.teams[teamName];
-		debug($.toJSON(team));
-		team.newSearch(query, sort, targets, teamName);
-	    }
+	    mkws.teams[teamName].run_auto_search();
 	}
     }