X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=c7396844d6cca587506bc448926fa6c24822b423;hb=ec95c20272197409599daa60edd48298a72312a4;hp=d41cba3a5e611a0435c5e3e272f8cb48b62ed6a2;hpb=5defa893fdac809e2378d18bcf5c650722149a89;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index d41cba3..c739684 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -174,6 +174,7 @@ function team($, teamName) {
 	"last": $.now()
     };
     var m_paz; // will be initialised below
+    var m_template = {};
 
 
     var debug = function (s) {
@@ -501,6 +502,8 @@ function team($, teamName) {
 	}
 	debug("triggerSearch(" + m_query + "): filters = " + $.toJSON(m_filters) + ", pp2filter = " + pp2filter + ", params = " + $.toJSON(params));
 
+	// We can use: params.torusquery = "udb=NAME"
+	// Note: that won't work when running against raw pazpar2
 	m_paz.search(m_query, m_perpage, m_sort, pp2filter, undefined, params);
     }
 
@@ -762,17 +765,23 @@ function team($, teamName) {
 
     function loadTemplate(name)
     {
-	var template = mkws['template' + name];
+	var template = m_template[name];
 
 	if (template === undefined) {
-	    var source = $("#mkwsTemplate" + name).html();
+	    // Fall back to generic template if there is no team-specific one
+	    var node = $(".mkwsTemplate_" + name + ".mkwsTeam_" + m_teamName)
+	    if (!node.length) {
+		node = $(".mkwsTemplate_" + name + ".mkwsTeam_ALL")
+	    }
+
+	    var source = node.html();
 	    if (!source) {
 		source = defaultTemplate(name);
 	    }
 
 	    template = Handlebars.compile(source);
 	    debug("compiled template '" + name + "'");
-	    mkws['template' + name] = template;
+	    m_template[name] = template;
 	}
 
 	return template;
@@ -1394,6 +1403,7 @@ function team($, teamName) {
 
 	// Find all nodes with an class, and determine their team from
 	// the mkwsTeam_* class. Make all team objects.
+	var then = $.now();
 	$('[class^="mkws"],[class*=" mkws"]').each(function () {
 	    var node = this;
 	    mkws.handle_node_with_team(node, function(tname) {
@@ -1403,6 +1413,8 @@ function team($, teamName) {
 		}
 	    });
 	});
+	var now = $.now();
+	debug("Walking MKWS nodes took " + (now-then) + " ms");
 
 	if (mkws_config.use_service_proxy) {
 	    authenticate_session(mkws_config.service_proxy_auth,