X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=b5e9908d090b3b11d3a8bed64182269b33844d0a;hp=44a88ee9f09dcff1a4a94ebd4cc313cac9610d58;hb=34edef98d30a3445451981ffd029b8681729f734;hpb=788e98b3367f8737657c66229a5351788c9c5c10

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 44a88ee..b5e9908 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -65,13 +65,19 @@ Handlebars.registerHelper('commaList', function(items, options) {
 });
 
 
+Handlebars.registerHelper('index1', function(obj) {
+    return obj.data.index + 1;
+});
+
+
 
 // Set up global mkws object. Contains truly global state such as SP
-// authentication, and a hash of team objects, indexed by windowid.
+// authentication, and a hash of team objects, indexed by team-name.
 //
 var mkws = {
     authenticated: false,
-    debug_level: undefined, // will be initialised from mkws_config
+    debug_level: 1, // Will be overridden from mkws_config, but
+		    // initial value allows jQuery popup to use logging.
     paz: undefined, // will be set up during initialisation
     teams: {},
     locale_lang: {
@@ -136,12 +142,50 @@ var mkws = {
 };
 
 
+// The following PubSub code is modified from the jQuery manual:
+// https://api.jquery.com/jQuery.Callbacks/
+//
+// Use as:
+//	mkws.queue("eventName").subscribe(function(param1, param2 ...) { ... });
+//	mkws.queue("eventName").publish(arg1, arg2, ...);
+
+(function() {
+  var queues = {};
+  mkws.queue = function(id) {
+    if (!queues[id]) {
+      var callbacks = $.Callbacks();
+      queues[id] = {
+	publish: callbacks.fire,
+	subscribe: callbacks.add,
+	unsubscribe: callbacks.remove
+      };
+    }
+    return queues[id];
+  }
+}());
+
+
 // Define empty mkws_config for simple applications that don't define it.
 if (mkws_config == null || typeof mkws_config != 'object') {
     var mkws_config = {};
 }
 
 
+// Factory function for widget objects.
+function widget($, team, type, node) {
+    var that = {
+	team: team,
+	type: type,
+	node: node
+    };
+
+    // ### More to do here, surely: e.g. wiring into the team
+    mkws.debug("made widget(team=" + team + ", type=" + type + ", node=" + node);
+
+    return that;
+}
+
+
 // Factory function for team objects. As much as possible, this uses
 // only member variables (prefixed "m_") and inner functions with
 // private scope. Some functions are visibl as member-functions to be
@@ -168,6 +212,7 @@ function team($, teamName) {
 	"last": $.now()
     };
     var m_paz; // will be initialised below
+    var m_template = {};
 
 
     var debug = function (s) {
@@ -183,20 +228,8 @@ function team($, teamName) {
     m_sort = mkws_config.sort_default;
     debug("copied mkws_config.sort_default '" + mkws_config.sort_default + "' to m_sort");
 
-    if (mkws_config.query_width < 5 || mkws_config.query_width > 150) {
-	debug("Reset query width: " + mkws_config.query_width);
-	mkws_config.query_width = 50;
-    }
-
-    for (var key in mkws_config) {
-	if (mkws_config.hasOwnProperty(key)) {
-	    if (key.match(/^language_/)) {
-		var lang = key.replace(/^language_/, "");
-		// Copy custom languages into list
-		mkws.locale_lang[lang] = mkws_config[key];
-		debug("Added locally configured language '" + lang + "'");
-	    }
-	}
+    if (!isNaN(parseInt(mkws_config.perpage_default))) {
+	m_perpage = parseInt(mkws_config.perpage_default);
     }
 
     // protocol independent link for pazpar2: "//mkws/sp" -> "https://mkws/sp"
@@ -209,72 +242,61 @@ function team($, teamName) {
     // create a parameters array and pass it to the pz2's constructor
     // then register the form submit event with the pz2.search function
     // autoInit is set to true on default
-    m_paz = new pz2({ "onshow": my_onshow,
-		      "windowid": teamName,
-		      "showtime": 500,            //each timer (show, stat, term, bytarget) can be specified this way
+    m_paz = new pz2({ "windowid": teamName,
 		      "pazpar2path": mkws_config.pazpar2_url,
-		      "oninit": my_oninit,
-		      "onstat": my_onstat,
-		      "onterm": (mkws_config.facets.length ? my_onterm : undefined),
-		      "termlist": mkws_config.facets.join(','),
-		      "onbytarget": my_onbytarget,
 		      "usesessions" : mkws_config.use_service_proxy ? false : true,
-		      "showResponseType": '', // or "json" (for debugging?)
-		      "onrecord": my_onrecord });
-
-    if (!isNaN(parseInt(mkws_config.perpage_default))) {
-	m_perpage = parseInt(mkws_config.perpage_default);
-    }
+		      "oninit": onInit,
+		      "onbytarget": onBytarget,
+		      "onstat": onStat,
+		      "onterm": (mkws_config.facets.length ? onTerm : undefined),
+		      "onshow": onShow,
+		      "onrecord": onRecord,
+		      "showtime": 500,            //each timer (show, stat, term, bytarget) can be specified this way
+		      "termlist": mkws_config.facets.join(',')
+		    });
 
 
     //
     // pz2.js event handlers:
     //
-    function my_oninit(teamName) {
+    function onInit(teamName) {
 	debug("init");
 	m_paz.stat();
 	m_paz.bytarget();
     }
 
 
-    function my_onshow(data, teamName) {
-	debug("show");
-	m_totalRec = data.merged;
-
-	var pager = $(".mkwsPager.mkwsTeam_" + m_teamName);
-	if (pager.length) {
-	    pager.html(drawPager(data))
+    function onBytarget(data, teamName) {
+	debug("target");
+	var targetDiv = findnode('.mkwsBytarget');
+	if (!targetDiv) {
+	    return;
 	}
 
-	var results = $(".mkwsRecords.mkwsTeam_" + m_teamName);
+	var table ='<table><thead><tr>' +
+	    '<td>' + M('Target ID') + '</td>' +
+	    '<td>' + M('Hits') + '</td>' +
+	    '<td>' + M('Diags') + '</td>' +
+	    '<td>' + M('Records') + '</td>' +
+	    '<td>' + M('State') + '</td>' +
+	    '</tr></thead><tbody>';
 
-	var html = [];
-	for (var i = 0; i < data.hits.length; i++) {
-            var hit = data.hits[i];
-	    html.push('<div class="record" id="mkwsRecdiv_' + hit.recid + '" >',
-		      renderSummary(hit),
-      		      '</div>');
-	    if (hit.recid == m_curDetRecId) {
-		if (m_curDetRecData)
-		    html.push(renderDetails(m_curDetRecData));
-	    }
+	for (var i = 0; i < data.length; i++) {
+            table += "<tr><td>" + data[i].id +
+		"</td><td>" + data[i].hits +
+		"</td><td>" + data[i].diagnostic +
+		"</td><td>" + data[i].records +
+		"</td><td>" + data[i].state + "</td></tr>";
 	}
-	results.html(html.join(''));
-    }
-
 
-    function renderSummary(hit)
-    {
-	var template = loadTemplate("Summary");
-	hit._id = "mkwsRec_" + hit.recid;
-	hit._onclick = "mkws.showDetails('" + m_teamName + "', this.id);return false;"
-	return template(hit);
+	table += '</tbody></table>';
+	targetDiv.html(table);
     }
 
 
-    function my_onstat(data, teamName) {
+    function onStat(data, teamName) {
 	debug("stat");
-	var stat = $('.mkwsStat.mkwsTeam_' + teamName);
+	var stat = findnode('.mkwsStat');
 	if (stat.length === 0)
 	    return;
 
@@ -286,14 +308,14 @@ function team($, teamName) {
     }
 
 
-    function my_onterm(data, teamName) {
+    function onTerm(data, teamName) {
 	debug("term");
-	var node = $(".mkwsTermlists.mkwsTeam_" + teamName);
+	var node = findnode(".mkwsTermlists");
 	if (node.length == 0) return;
 
 	// no facets: this should never happen
 	if (!mkws_config.facets || mkws_config.facets.length == 0) {
-	    alert("my_onterm called even though we have no facets: " + $.toJSON(data));
+	    alert("onTerm called even though we have no facets: " + $.toJSON(data));
 	    node.hide();
 	    return;
 	}
@@ -307,11 +329,11 @@ function team($, teamName) {
 
 	for(var i = 0; i < facets.length; i++) {
 	    if (facets[i] == "xtargets") {
-		add_single_facet(acc, "Sources",  data.xtargets, 16, null);
+		addSingleFacet(acc, "Sources",  data.xtargets, 16, null);
 	    } else if (facets[i] == "subject") {
-		add_single_facet(acc, "Subjects", data.subject,  10, "subject");
+		addSingleFacet(acc, "Subjects", data.subject,  10, "subject");
 	    } else if (facets[i] == "author") {
-		add_single_facet(acc, "Authors",  data.author,   10, "author");
+		addSingleFacet(acc, "Authors",  data.author,   10, "author");
 	    } else {
 		alert("bad facet configuration: '" + facets[i] + "'");
 	    }
@@ -321,17 +343,61 @@ function team($, teamName) {
     }
 
 
-    function add_single_facet(acc, caption, data, max, pzIndex) {
+    function onShow(data, teamName) {
+	debug("show");
+	m_totalRec = data.merged;
+
+	var pager = findnode(".mkwsPager");
+	if (pager.length) {
+	    pager.html(drawPager(data))
+	}
+
+	var results = findnode(".mkwsRecords");
+	if (!results.length)
+	    return;
+
+	var html = [];
+	for (var i = 0; i < data.hits.length; i++) {
+            var hit = data.hits[i];
+	    html.push('<div class="record" id="mkwsRecdiv_' + teamName + '_' + hit.recid + '" >',
+		      renderSummary(hit),
+      		      '</div>');
+	    if (hit.recid == m_curDetRecId) {
+		if (m_curDetRecData)
+		    html.push(renderDetails(m_curDetRecData));
+	    }
+	}
+	results.html(html.join(''));
+    }
+
+
+    function onRecord(data, args, teamName) {
+	debug("record: teamName=" + teamName + ", m_teamName=" + m_teamName);
+	// FIXME: record is async!!
+	clearTimeout(m_paz.recordTimer);
+	// in case on_show was faster to redraw element
+	var detRecordDiv = document.getElementById('mkwsDet_' + teamName + '_' + data.recid);
+	if (detRecordDiv) return;
+	m_curDetRecData = data;
+	var recordDiv = document.getElementById('mkwsRecdiv_' + teamName + '_' + m_curDetRecData.recid);
+	var html = renderDetails(m_curDetRecData);
+	recordDiv.innerHTML += html;
+    }
+
+
+    function addSingleFacet(acc, caption, data, max, pzIndex) {
 	acc.push('<div class="facet mkwsFacet' + caption + ' mkwsTeam_' + m_teamName + '">');
 	acc.push('<div class="termtitle">' + M(caption) + '</div>');
 	for (var i = 0; i < data.length && i < max; i++) {
 	    acc.push('<div class="term">');
             acc.push('<a href="#" ');
-	    var action;
+	    var action = '';
 	    if (!pzIndex) {
 		// Special case: target selection
 		acc.push('target_id='+data[i].id+' ');
-		action = 'mkws.limitTarget(\'' + m_teamName + '\', this.getAttribute(\'target_id\'),this.firstChild.nodeValue)';
+		if (!targetFiltered(data[i].id)) {
+		    action = 'mkws.limitTarget(\'' + m_teamName + '\', this.getAttribute(\'target_id\'),this.firstChild.nodeValue)';
+		}
 	    } else {
 		action = 'mkws.limitQuery(\'' + m_teamName + '\', \'' + pzIndex + '\', this.firstChild.nodeValue)';
 	    }
@@ -343,47 +409,17 @@ function team($, teamName) {
     }
 
 
-    function my_onrecord(data, args, teamName) {
-	debug("record");
-	// FIXME: record is async!!
-	clearTimeout(m_paz.recordTimer);
-	// in case on_show was faster to redraw element
-	var detRecordDiv = document.getElementById('mkwsDet_'+data.recid);
-	if (detRecordDiv) return;
-	m_curDetRecData = data;
-	var recordDiv = document.getElementById('mkwsRecdiv_'+m_curDetRecData.recid);
-	var html = renderDetails(m_curDetRecData);
-	recordDiv.innerHTML += html;
-    }
-
-
-    function my_onbytarget(data, teamName) {
-	debug("target");
-	var targetDiv = $('.mkwsBytarget.mkwsTeam_' + teamName);
-	if (!targetDiv) {
-	    return;
-	}
-
-	var table ='<table><thead><tr>' +
-	    '<td>' + M('Target ID') + '</td>' +
-	    '<td>' + M('Hits') + '</td>' +
-	    '<td>' + M('Diags') + '</td>' +
-	    '<td>' + M('Records') + '</td>' +
-	    '<td>' + M('State') + '</td>' +
-	    '</tr></thead><tbody>';
-
-	for (var i = 0; i < data.length; i++) {
-            table += "<tr><td>" + data[i].id +
-		"</td><td>" + data[i].hits +
-		"</td><td>" + data[i].diagnostic +
-		"</td><td>" + data[i].records +
-		"</td><td>" + data[i].state + "</td></tr>";
+    function targetFiltered(id) {
+	for (var i = 0; i < m_filters.length; i++) {
+	    if (m_filters[i].id === id ||
+		m_filters[i].id === 'pz:id=' + id) {
+		return true;
+	    }
 	}
-
-	table += '</tbody></table>';
-	targetDiv.html(table);
+	return false;
     }
 
+
     ////////////////////////////////////////////////////////////////////////////////
     ////////////////////////////////////////////////////////////////////////////////
 
@@ -391,16 +427,13 @@ function team($, teamName) {
     // when search button pressed
     function onFormSubmitEventHandler()
     {
-	mkws.handle_node_with_team(this, function (tname) {
-	    var val = $('.mkwsQuery.mkwsTeam_' + tname).val();
-	    mkws.teams[tname].newSearch(val);
-	});
-
+	var val = findnode('.mkwsQuery').val();
+	newSearch(val);
 	return false;
     }
 
 
-    that.newSearch = function(query, sort, targets, windowid)
+    function newSearch(query, sort, targets)
     {
 	debug("newSearch: " + query);
 
@@ -410,11 +443,11 @@ function team($, teamName) {
 	}
 
 	m_filters = []
-	redraw_navi();
+	redrawNavi();
 	resetPage();
 	loadSelect();
-	triggerSearch(query, sort, targets, windowid);
-	that.switchView('records'); // In case it's configured to start off as hidden
+	triggerSearch(query, sort, targets);
+	switchView('records'); // In case it's configured to start off as hidden
 	m_submitted = true;
     }
 
@@ -436,7 +469,7 @@ function team($, teamName) {
     }
 
 
-    function triggerSearch (query, sort, targets, windowid)
+    function triggerSearch (query, sort, targets)
     {
 	var pp2filter = "";
 	var pp2limit = "";
@@ -449,7 +482,6 @@ function team($, teamName) {
 	    m_sort = sort;
 	}
 	if (targets) {
-	    // ### should support multiple |-separated targets
 	    m_filters.push({ id: targets, name: targets });
 	}
 
@@ -475,23 +507,23 @@ function team($, teamName) {
 	if (pp2limit) {
 	    params.limit = pp2limit;
 	}
-	if (windowid) {
-	    params.windowid = windowid;
-	}
+
 	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);
     }
 
 
     function loadSelect ()
     {
-	var node = $('.mkwsSort.mkwsTeam_' + m_teamName);
+	var node = findnode('.mkwsSort');
 	if (node.length && node.val() != m_sort) {
 	    debug("changing m_sort from " + m_sort + " to " + node.val());
 	    m_sort = node.val();
 	}
-	node = $('.mkwsPerpage.mkwsTeam_' + m_teamName);
+	node = findnode('.mkwsPerpage');
 	if (node.length && node.val() != m_perpage) {
 	    debug("changing m_perpage from " + m_perpage + " to " + node.val());
 	    m_perpage = node.val();
@@ -504,7 +536,7 @@ function team($, teamName) {
     {
 	debug("limitTarget(id=" + id + ", name=" + name + ")");
 	m_filters.push({ id: id, name: name });
-	redraw_navi();
+	redrawNavi();
 	resetPage();
 	loadSelect();
 	triggerSearch();
@@ -517,7 +549,7 @@ function team($, teamName) {
     {
 	debug("limitQuery(field=" + field + ", value=" + value + ")");
 	m_filters.push({ field: field, value: value });
-	redraw_navi();
+	redrawNavi();
 	resetPage();
 	loadSelect();
 	triggerSearch();
@@ -540,7 +572,7 @@ function team($, teamName) {
 	}
 	m_filters = newFilters;
 
-	redraw_navi();
+	redrawNavi();
 	resetPage();
 	loadSelect();
 	triggerSearch();
@@ -565,7 +597,7 @@ function team($, teamName) {
 	}
 	m_filters = newFilters;
 
-	redraw_navi();
+	redrawNavi();
 	resetPage();
 	loadSelect();
 	triggerSearch();
@@ -573,9 +605,9 @@ function team($, teamName) {
     }
 
 
-    function redraw_navi ()
+    function redrawNavi ()
     {
-	var navi = $('.mkwsNavi.mkwsTeam_' + m_teamName);
+	var navi = findnode('.mkwsNavi');
 	if (!navi) return;
 
 	var text = "";
@@ -675,11 +707,11 @@ function team($, teamName) {
 
 
     // switching view between targets and records
-    that.switchView = function(view) {
-	var targets = $('.mkwsTargets.mkwsTeam_' + m_teamName);
-	var results = $('.mkwsResults.mkwsTeam_' + m_teamName + ',.mkwsRecords.mkwsTeam_' + m_teamName);
-	var blanket = $('.mkwsBlanket.mkwsTeam_' + m_teamName);
-	var motd    = $('.mkwsMOTD.mkwsTeam_' + m_teamName);
+    function switchView(view) {
+	var targets = findnode('.mkwsTargets');
+	var results = findnode('.mkwsResults,.mkwsRecords');
+	var blanket = findnode('.mkwsBlanket');
+	var motd    = findnode('.mkwsMOTD');
 
 	switch(view) {
         case 'targets':
@@ -707,6 +739,9 @@ function team($, teamName) {
     }
 
 
+    that.switchView = switchView;
+
+
     // detailed record drawing
     that.showDetails = function (prefixRecId) {
 	var recId = prefixRecId.replace('mkwsRec_', '');
@@ -714,7 +749,7 @@ function team($, teamName) {
 	m_curDetRecId = recId;
 
 	// remove current detailed view if any
-	var detRecordDiv = document.getElementById('mkwsDet_'+oldRecId);
+	var detRecordDiv = document.getElementById('mkwsDet_' + m_teamName + '_' + oldRecId);
 	// lovin DOM!
 	if (detRecordDiv)
 	    detRecordDiv.parentNode.removeChild(detRecordDiv);
@@ -731,135 +766,22 @@ function team($, teamName) {
     }
 
 
-    function renderDetails(data, marker)
-    {
-	var template = loadTemplate("Record");
-	var details = template(data);
-	return '<div class="details" id="mkwsDet_' + data.recid + '">' + details + '</div>';
-    }
-
-
-    function loadTemplate(name)
-    {
-	var template = mkws['template' + name];
-
-	if (template === undefined) {
-	    var source = $("#mkwsTemplate" + name).html();
-	    if (!source) {
-		source = defaultTemplate(name);
-	    }
-
-	    template = Handlebars.compile(source);
-	    debug("compiled template '" + name + "'");
-	    mkws['template' + name] = template;
-	}
-
-	return template;
-    }
-
-
-    function defaultTemplate(name)
-    {
-	if (name === 'Record') {
-	    return '\
-<table>\
-  <tr>\
-    <th>{{translate "Title"}}</th>\
-    <td>\
-      {{md-title}}\
-      {{#if md-title-remainder}}\
-	({{md-title-remainder}})\
-      {{/if}}\
-      {{#if md-title-responsibility}}\
-	<i>{{md-title-responsibility}}</i>\
-      {{/if}}\
-    </td>\
-  </tr>\
-  {{#if md-date}}\
-  <tr>\
-    <th>{{translate "Date"}}</th>\
-    <td>{{md-date}}</td>\
-  </tr>\
-  {{/if}}\
-  {{#if md-author}}\
-  <tr>\
-    <th>{{translate "Author"}}</th>\
-    <td>{{md-author}}</td>\
-  </tr>\
-  {{/if}}\
-  {{#if md-electronic-url}}\
-  <tr>\
-    <th>{{translate "URL"}}</th>\
-    <td>\
-      {{#each md-electronic-url}}\
-	<a href="{{this}}">{{this}}</a><br/>\
-      {{/each}}\
-    </td>\
-  </tr>\
-  {{/if}}\
-  {{#if-any location having="md-subject"}}\
-  <tr>\
-    <th>{{translate "Subject"}}</th>\
-    <td>\
-      {{#first location having="md-subject"}}\
-	{{#if md-subject}}\
-	  {{md-subject}}\
-	{{/if}}\
-      {{/first}}\
-    </td>\
-  </tr>\
-  {{/if-any}}\
-  <tr>\
-    <th>{{translate "Locations"}}</th>\
-    <td>\
-      {{#commaList location}}\
-	{{attr "@name"}}{{/commaList}}\
-    </td>\
-  </tr>\
-</table>\
-';
-	} else if (name === "Summary") {
-	    return '\
-<a href="#" id="{{_id}}" onclick="{{_onclick}}">\
-  <b>{{md-title}}</b>\
-</a>\
-{{#if md-title-remainder}}\
-  <span>{{md-title-remainder}}</span>\
-{{/if}}\
-{{#if md-title-responsibility}}\
-  <span><i>{{md-title-responsibility}}</i></span>\
-{{/if}}\
-';
-	}
-
-	var s = "There is no default '" + name +"' template!";
-	alert(s);
-	return s;
-    }
-
-
     /*
      * All the HTML stuff to render the search forms and
      * result pages.
      */
-    function mkws_html_all() {
-	mkws_set_lang();
+    function mkwsHtmlAll() {
+	mkwsSetLang();
 	if (mkws_config.show_lang)
-	    mkws_html_lang();
+	    mkwsHtmlLang();
 
-	// For some reason, doing this programmatically results in
-	// document.mkwsSearchForm.mkwsQuery being undefined, hence the raw HTML.
 	debug("HTML search form");
-	// ### There is only one match here by design: fix not to bother looping
-	$('.mkwsSearch.mkwsTeam_' + m_teamName).each(function (i, obj) {
-	    var node = this;
-	    mkws.handle_node_with_team(node, function(tname) {
-		$(node).html('\
+	mkws.handleNodeWithTeam(findnode('.mkwsSearch'), function(tname) {
+	    this.html('\
 <form name="mkwsSearchForm" class="mkwsSearchForm mkwsTeam_' + tname + '" action="" >\
-  <input id="mkwsQuery" class="mkwsQuery mkwsTeam_' + tname + '" type="text" size="' + mkws_config.query_width + '" />\
-  <input id="mkwsButton" class="mkwsButton mkwsTeam_' + tname + '" type="submit" value="' + M('Search') + '" />\
+  <input class="mkwsQuery mkwsTeam_' + tname + '" type="text" size="' + mkws_config.query_width + '" />\
+  <input class="mkwsButton mkwsTeam_' + tname + '" type="submit" value="' + M('Search') + '" />\
 </form>');
-	    });
 	});
 
 	debug("HTML records");
@@ -872,18 +794,18 @@ function team($, teamName) {
 	//	.mkwsPager
 	//	.mkwsNavi
 	//	.mkwsRecords
-	if ($(".mkwsResults.mkwsTeam_" + m_teamName).length) {
-	    $(".mkwsResults.mkwsTeam_" + m_teamName).html('\
+	if (findnode(".mkwsResults").length) {
+	    findnode(".mkwsResults").html('\
 <table width="100%" border="0" cellpadding="6" cellspacing="0">\
   <tr>\
     <td class="mkwsTermlistContainer1 mkwsTeam_' + m_teamName + '" width="250" valign="top">\
-      <div id="mkwsTermlists" class="mkwsTermlists mkwsTeam_' + m_teamName + '"></div>\
+      <div class="mkwsTermlists mkwsTeam_' + m_teamName + '"></div>\
     </td>\
     <td class="mkwsMOTDContainer mkwsTeam_' + m_teamName + '" valign="top">\
-      <div id="mkwsRanking" class="mkwsRanking mkwsTeam_' + m_teamName + '"></div>\
-      <div id="mkwsPager" class="mkwsPager mkwsTeam_' + m_teamName + '"></div>\
-      <div id="mkwsNavi" class="mkwsNavi mkwsTeam_' + m_teamName + '"></div>\
-      <div id="mkwsRecords" class="mkwsRecords mkwsTeam_' + m_teamName + '"></div>\
+      <div class="mkwsRanking mkwsTeam_' + m_teamName + '"></div>\
+      <div class="mkwsPager mkwsTeam_' + m_teamName + '"></div>\
+      <div class="mkwsNavi mkwsTeam_' + m_teamName + '"></div>\
+      <div class="mkwsRecords mkwsTeam_' + m_teamName + '"></div>\
     </td>\
   </tr>\
   <tr>\
@@ -894,52 +816,38 @@ function team($, teamName) {
 </table>');
 	}
 
-	var node = $(".mkwsRanking.mkwsTeam_" + m_teamName);
+	var node = findnode(".mkwsRanking");
 	if (node.length) {
 	    var ranking_data = '';
 	    ranking_data += '<form name="mkwsSelect" class="mkwsSelect mkwsTeam_' + m_teamName + '" action="" >';
 	    if (mkws_config.show_sort) {
-		ranking_data +=  M('Sort by') + ' ' + mkws_html_sort() + ' ';
+		ranking_data +=  M('Sort by') + ' ' + mkwsHtmlSort() + ' ';
 	    }
 	    if (mkws_config.show_perpage) {
-		ranking_data += M('and show') + ' ' + mkws_html_perpage() + ' ' + M('per page') + '.';
+		ranking_data += M('and show') + ' ' + mkwsHtmlPerpage() + ' ' + M('per page') + '.';
 	    }
             ranking_data += '</form>';
 
 	    node.html(ranking_data);
 	}
 
-	mkws_html_switch();
+	mkwsHtmlSwitch();
 
-	// ### Should not be in the team code, since window size is global
-	if (mkws_config.responsive_design_width) {
-	    // Responsive web design - change layout on the fly based on
-	    // current screen width. Required for mobile devices.
-	    $(window).resize(function(e) { mkws.resize_page() });
-	    // initial check after page load
-	    $(document).ready(function() { mkws.resize_page() });
-	}
-
-	$('.mkwsSearchForm.mkwsTeam_' + m_teamName).each(function (i, obj) {
-	    debug("adding search-forms for team '" + m_teamName + "'");
-	    var node = this;
-	    mkws.handle_node_with_team(node, function(tname) {
-		debug("adding search-form '" + tname + "' for team '" + m_teamName + "'");
-		$(node).submit(onFormSubmitEventHandler);
-	    });
-	});
-
-	node = $('.mkwsSort.mkwsTeam_' + m_teamName);
+	var node;
+	node = findnode('.mkwsSearchForm');
+	if (node.length)
+	    node.submit(onFormSubmitEventHandler);
+	node = findnode('.mkwsSort');
 	if (node.length)
 	    node.change(onSelectDdChange);
-	node = $('.mkwsPerpage.mkwsTeam_' + m_teamName);
+	node = findnode('.mkwsPerpage');
 	if (node.length)
 	    node.change(onSelectDdChange);
 
 	// on first page, hide the termlist
-	$(document).ready(function() { $(".mkwsTermlists.mkwsTeam_" + m_teamName).hide(); });
-	var motd = $(".mkwsMOTD.mkwsTeam_" + m_teamName);
-	var container = $(".mkwsMOTDContainer.mkwsTeam_" + m_teamName);
+	$(document).ready(function() { findnode(".mkwsTermlists").hide(); });
+	var motd = findnode(".mkwsMOTD");
+        var container = findnode(".mkwsMOTDContainer");
 	if (motd.length && container.length) {
 	    // Move the MOTD from the provided element down into the container
 	    motd.appendTo(container);
@@ -947,20 +855,7 @@ function team($, teamName) {
     }
 
 
-    // implement $.parseQuerystring() for parsing URL parameters
-    function parseQuerystring() {
-	var nvpair = {};
-	var qs = window.location.search.replace('?', '');
-	var pairs = qs.split('&');
-	$.each(pairs, function(i, v){
-	    var pair = v.split('=');
-	    nvpair[pair[0]] = pair[1];
-	});
-	return nvpair;
-    }
-
-
-    function mkws_set_lang()  {
+    function mkwsSetLang()  {
 	var lang = parseQuerystring().lang || mkws_config.lang;
 	if (!lang || !mkws.locale_lang[lang]) {
 	    mkws_config.lang = ""
@@ -973,16 +868,16 @@ function team($, teamName) {
     }
 
 
-    function mkws_html_switch() {
+    function mkwsHtmlSwitch() {
 	debug("HTML switch for team " + m_teamName);
 
-	var node = $(".mkwsSwitch.mkwsTeam_" + m_teamName);
+	var node = findnode(".mkwsSwitch");
 	node.append($('<a href="#" onclick="mkws.switchView(\'' + m_teamName + '\', \'records\')">' + M('Records') + '</a>'));
 	node.append($("<span/>", { text: " | " }));
 	node.append($('<a href="#" onclick="mkws.switchView(\'' + m_teamName + '\', \'targets\')">' + M('Targets') + '</a>'));
 
 	debug("HTML targets");
-	var node = $(".mkwsTargets.mkwsTeam_" + m_teamName);
+	var node = findnode(".mkwsTargets");
 	node.html('\
 <div class="mkwsBytarget mkwsTeam_' + m_teamName + '">\
   No information available yet.\
@@ -991,7 +886,7 @@ function team($, teamName) {
     }
 
 
-    function mkws_html_sort() {
+    function mkwsHtmlSort() {
 	debug("HTML sort, m_sort = '" + m_sort + "'");
 	var sort_html = '<select class="mkwsSort mkwsTeam_' + m_teamName + '">';
 
@@ -1012,7 +907,7 @@ function team($, teamName) {
     }
 
 
-    function mkws_html_perpage() {
+    function mkwsHtmlPerpage() {
 	debug("HTML perpage, m_perpage = " + m_perpage);
 	var perpage_html = '<select class="mkwsPerpage mkwsTeam_' + m_teamName + '">';
 
@@ -1032,7 +927,7 @@ function team($, teamName) {
 
 
     /* create locale language menu */
-    function mkws_html_lang() {
+    function mkwsHtmlLang() {
 	var lang_default = "en";
 	var lang = mkws_config.lang || lang_default;
 	var list = [];
@@ -1070,7 +965,68 @@ function team($, teamName) {
 	    }
 	}
 
-	$(".mkwsLang.mkwsTeam_" + m_teamName).html(data);
+	findnode(".mkwsLang").html(data);
+    }
+
+
+    that.runAutoSearch = function() {
+	// ### should check mkwsTermlist as well, for facet-only teams
+	var node = findnode('.mkwsRecords');
+	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);
+
+	newSearch(query, sort, targets);
+    }
+
+
+    // implement $.parseQuerystring() for parsing URL parameters
+    function parseQuerystring() {
+	var nvpair = {};
+	var qs = window.location.search.replace('?', '');
+	var pairs = qs.split('&');
+	$.each(pairs, function(i, v){
+	    var pair = v.split('=');
+	    nvpair[pair[0]] = pair[1];
+	});
+	return nvpair;
+    }
+
+
+    // This function is taken from a StackOverflow answer
+    // http://stackoverflow.com/questions/901115/how-can-i-get-query-string-values-in-javascript/901144#901144
+    // ### should we unify this and parseQuerystring()?
+    function getParameterByName(name) {
+	name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
+	var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"),
+	    results = regex.exec(location.search);
+	return results == null ? "" : decodeURIComponent(results[1].replace(/\+/g, " "));
     }
 
 
@@ -1086,156 +1042,159 @@ function team($, teamName) {
     mkws.M = M; // so the Handlebars helper can use it
 
 
-    // main
-    (function() {
-	try {
-	    mkws_html_all()
-	}
+    // Finds the node of the specified class within the current team
+    // Multiple OR-clauses separated by commas are handled
+    // More complex cases may not work
+    //
+    function findnode(selector, teamName) {
+	teamName = teamName || m_teamName;
 
-	catch (e) {
-	    mkws_config.error = e.message;
-	    // alert(e.message);
-	}
-    })();
+	selector = selector.split(',').map(function(s) {
+	    return s + '.mkwsTeam_' + teamName;
+	}).join(',');
 
-    // Bizarrely, 'that' is just an empty hash. All its state is in
-    // the closure variables defined earlier in this function.
-    return that;
-};
+	return $(selector);
+    }
 
 
-/*
- * implement jQuery plugin $.pazpar2({})
- */
-function _mkws_jquery_plugin ($) {
-    function debug (string) {
-	mkws.debug("jquery.pazpar2: " + string);
+    function renderSummary(hit)
+    {
+	var template = loadTemplate("Summary");
+	hit._id = "mkwsRec_" + hit.recid;
+	hit._onclick = "mkws.showDetails('" + m_teamName + "', this.id);return false;"
+	return template(hit);
     }
 
-    function init_popup(obj) {
-	var config = obj ? obj : {};
 
-	var height = config.height || 760;
-	var width = config.width || 880;
-	var id_button = config.id_button || "input#mkwsButton";
-	var id_popup = config.id_popup || "#mkwsPopup";
+    function renderDetails(data, marker)
+    {
+	var template = loadTemplate("Record");
+	var details = template(data);
+	return '<div class="details" id="mkwsDet_' + m_teamName + '_' + data.recid + '">' + details + '</div>';
+    }
 
-	debug("popup height: " + height + ", width: " + width);
 
-	// make sure that jquery-ui was loaded afte jQuery core lib, e.g.:
-	// <script src="http://code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
-	if (!$.ui) {
-	    debug("Error: jquery-ui.js is missing, did you include it after jQuery core in the HTML file?");
-	    return;
+    function loadTemplate(name)
+    {
+	var template = m_template[name];
+
+	if (template === undefined) {
+	    // Fall back to generic template if there is no team-specific one
+	    var node = findnode(".mkwsTemplate_" + name);
+	    if (!node.length) {
+		node = findnode(".mkwsTemplate_" + name, "ALL");
+	    }
+
+	    var source = node.html();
+	    if (!source) {
+		source = defaultTemplate(name);
+	    }
+
+	    template = Handlebars.compile(source);
+	    debug("compiled template '" + name + "'");
+	    m_template[name] = template;
 	}
 
-	$(id_popup).dialog({
-	    closeOnEscape: true,
-	    autoOpen: false,
-	    height: height,
-	    width: width,
-	    modal: true,
-	    resizable: true,
-	    buttons: {
-		Cancel: function() {
-		    $(this).dialog("close");
-		}
-	    },
-	    close: function() { }
-	});
+	return template;
+    }
 
-	$(id_button)
-	    .button()
-	    .click(function() {
-		$(id_popup).dialog("open");
-	    });
-    };
 
-    $.extend({
-
-	// service-proxy or pazpar2
-	pazpar2: function(config) {
-	    var id_popup = config.id_popup || "#mkwsPopup";
-	    id_popup = id_popup.replace(/^#/, "");
-
-	    // simple layout
-	    var div = '\
-<div id="mkwsSwitch"></div>\
-<div id="mkwsLang"></div>\
-<div id="mkwsSearch"></div>\
-<div id="mkwsResults"></div>\
-<div id="mkwsTargets"></div>\
-<div id="mkwsStat"></div>';
-
-	    // new table layout
-	    var table = '\
-<style type="text/css">\
-  #mkwsTermlists div.facet {\
-  float:left;\
-  width: 30%;\
-  margin: 0.3em;\
-  }\
-  #mkwsStat {\
-  text-align: right;\
-  }\
-</style>\
-    \
-<table width="100%" border="0">\
+    function defaultTemplate(name)
+    {
+	if (name === 'Record') {
+	    return '\
+<table>\
   <tr>\
+    <th>{{translate "Title"}}</th>\
     <td>\
-      <div id="mkwsSwitch"></div>\
-      <div id="mkwsLang"></div>\
-      <div id="mkwsSearch"></div>\
+      {{md-title}}\
+      {{#if md-title-remainder}}\
+	({{md-title-remainder}})\
+      {{/if}}\
+      {{#if md-title-responsibility}}\
+	<i>{{md-title-responsibility}}</i>\
+      {{/if}}\
     </td>\
   </tr>\
+  {{#if md-date}}\
   <tr>\
+    <th>{{translate "Date"}}</th>\
+    <td>{{md-date}}</td>\
+  </tr>\
+  {{/if}}\
+  {{#if md-author}}\
+  <tr>\
+    <th>{{translate "Author"}}</th>\
+    <td>{{md-author}}</td>\
+  </tr>\
+  {{/if}}\
+  {{#if md-electronic-url}}\
+  <tr>\
+    <th>{{translate "Links"}}</th>\
     <td>\
-      <div style="height:500px; overflow: auto">\
-	<div id="mkwsPager"></div>\
-	<div id="mkwsNavi"></div>\
-	<div id="mkwsRecords"></div>\
-	<div id="mkwsTargets"></div>\
-	<div id="mkwsRanking"></div>\
-      </div>\
+      {{#each md-electronic-url}}\
+	<a href="{{this}}">Link{{index1}}</a>\
+      {{/each}}\
     </td>\
   </tr>\
+  {{/if}}\
+  {{#if-any location having="md-subject"}}\
   <tr>\
+    <th>{{translate "Subject"}}</th>\
     <td>\
-      <div style="height:300px; overflow: hidden">\
-	<div id="mkwsTermlists"></div>\
-      </div>\
+      {{#first location having="md-subject"}}\
+	{{#if md-subject}}\
+	  {{#commaList md-subject}}\
+	    {{this}}{{/commaList}}\
+	{{/if}}\
+      {{/first}}\
     </td>\
   </tr>\
+  {{/if-any}}\
   <tr>\
+    <th>{{translate "Locations"}}</th>\
     <td>\
-      <div id="mkwsStat"></div>\
+      {{#commaList location}}\
+	{{attr "@name"}}{{/commaList}}\
     </td>\
   </tr>\
-</table>';
-
-	    var popup = '\
-<div id="mkwsSearch"></div>\
-<div id="' + id_popup + '">\
-  <div id="mkwsSwitch"></div>\
-  <div id="mkwsLang"></div>\
-  <div id="mkwsResults"></div>\
-  <div id="mkwsTargets"></div>\
-  <div id="mkwsStat"></div>\
-</div>'
-
-	    if (config && config.layout == 'div') {
-		debug("jquery plugin layout: div");
-		document.write(div);
-	    } else if (config && config.layout == 'popup') {
-		debug("jquery plugin layout: popup with id: " + id_popup);
-		document.write(popup);
-		$(document).ready(function() { init_popup(config); });
-	    } else {
-		debug("jquery plugin layout: table");
-		document.write(table);
-	    }
+</table>\
+';
+	} else if (name === "Summary") {
+	    return '\
+<a href="#" id="{{_id}}" onclick="{{_onclick}}">\
+  <b>{{md-title}}</b>\
+</a>\
+{{#if md-title-remainder}}\
+  <span>{{md-title-remainder}}</span>\
+{{/if}}\
+{{#if md-title-responsibility}}\
+  <span><i>{{md-title-responsibility}}</i></span>\
+{{/if}}\
+';
 	}
-    });
+
+	var s = "There is no default '" + name +"' template!";
+	alert(s);
+	return s;
+    }
+
+
+    // main
+    (function() {
+	try {
+	    mkwsHtmlAll()
+	}
+
+	catch (e) {
+	    mkws_config.error = e.message;
+	    // alert(e.message);
+	}
+    })();
+
+    // Bizarrely, 'that' is just an empty hash. All its state is in
+    // the closure variables defined earlier in this function.
+    return that;
 };
 
 
@@ -1260,25 +1219,33 @@ function _mkws_jquery_plugin ($) {
     var debug = mkws.debug;
 
 
-    // enable before page load, so we could call it before mkws() runs
-    _mkws_jquery_plugin(j);
-
-
-    mkws.handle_node_with_team = function(node, callback) {
-	var classes = node.className;
+    mkws.handleNodeWithTeam = function(node, callback) {
+	// First branch for DOM objects; second branch for jQuery objects
+	var classes = node.className || node.attr('class');
+	if (!classes) {
+	    // For some reason, if we try to proceed when classes is
+	    // undefined, we don't get an error message, but this
+	    // function and its callers, up several stack level,
+	    // silently return. What a crock.
+	    mkws.debug("handleNodeWithTeam() called on node with no classes");
+	    return;
+	}
  	var list = classes.split(/\s+/)
-	var tname;
+	var teamName, type;
+
 	for (var i = 0; i < list.length; i++) {
 	    var cname = list[i];
 	    if (cname.match(/^mkwsTeam_/)) {
-		tname = cname.replace(/^mkwsTeam_/, '');
+		teamName = cname.replace(/^mkwsTeam_/, '');
+	    } else if (cname.match(/^mkws/)) {
+		type = cname.replace(/^mkws/, '');
 	    }
 	}
-	callback(tname);
+	callback.call(node, teamName, type);
     }
 
 
-    mkws.resize_page = function () {
+    mkws.resizePage = function () {
 	var list = ["mkwsSwitch", "mkwsLang"];
 
 	var width = mkws_config.responsive_design_width;
@@ -1347,7 +1314,7 @@ function _mkws_jquery_plugin ($) {
     }
 
 
-    function default_mkws_config() {
+    function defaultMkwsConfig() {
 	/* default mkws config */
 	var config_default = {
 	    use_service_proxy: true,
@@ -1397,7 +1364,7 @@ function _mkws_jquery_plugin ($) {
      * The username/password is configured in the apache config file
      * for the site.
      */
-    function authenticate_session(auth_url, auth_domain, pp2_url) {
+    function authenticateSession(auth_url, auth_domain, pp2_url) {
 	debug("Run service proxy auth URL: " + auth_url);
 
 	if (!auth_domain) {
@@ -1423,45 +1390,53 @@ function _mkws_jquery_plugin ($) {
 
 	    debug("Service proxy auth successfully done");
 	    mkws.authenticated = true;
-	    run_auto_searches();
+	    runAutoSearches();
 	});
     }
 
 
-    function run_auto_searches() {
+    function runAutoSearches() {
 	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');
-	    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].runAutoSearch();
 	}
     }
 
 
     $(document).ready(function() {
 	debug("on load ready");
-	default_mkws_config();
+	defaultMkwsConfig();
+
+	if (mkws_config.query_width < 5 || mkws_config.query_width > 150) {
+	    debug("Reset query width: " + mkws_config.query_width);
+	    mkws_config.query_width = 50;
+	}
+
+	for (var key in mkws_config) {
+	    if (mkws_config.hasOwnProperty(key)) {
+		if (key.match(/^language_/)) {
+		    var lang = key.replace(/^language_/, "");
+		    // Copy custom languages into list
+		    mkws.locale_lang[lang] = mkws_config[key];
+		    debug("Added locally configured language '" + lang + "'");
+		}
+	    }
+	}
+
+	if (mkws_config.responsive_design_width) {
+	    // Responsive web design - change layout on the fly based on
+	    // current screen width. Required for mobile devices.
+	    $(window).resize(function(e) { mkws.resizePage() });
+	    // initial check after page load
+	    $(document).ready(function() { mkws.resizePage() });
+	}
 
 	// Backwards compatibility: set new magic class names on any
 	// elements that have the old magic IDs.
 	var ids = [ "Switch", "Lang", "Search", "Pager", "Navi",
 		    "Results", "Records", "Targets", "Ranking",
-		    "Termlists", "Stat" ];
+		    "Termlists", "Stat", "MOTD" ];
 	for (var i = 0; i < ids.length; i++) {
 	    var id = 'mkws' + ids[i];
 	    var node = $('#' + id);
@@ -1482,23 +1457,27 @@ function _mkws_jquery_plugin ($) {
 
 	// 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) {
+	    mkws.handleNodeWithTeam(this, function(tname, type) {
 		if (!mkws.teams[tname]) {
 		    mkws.teams[tname] = team(j, tname);
 		    debug("Made MKWS team '" + tname + "'");
 		}
+		var myTeam = mkws.teams[tname];
+		var myWidget = widget(j, myTeam, type, this);
 	    });
 	});
+	var now = $.now();
+	debug("Walking MKWS nodes took " + (now-then) + " ms");
 
 	if (mkws_config.use_service_proxy) {
-	    authenticate_session(mkws_config.service_proxy_auth,
-				 mkws_config.service_proxy_auth_domain,
-				 mkws_config.pazpar2_url);
+	    authenticateSession(mkws_config.service_proxy_auth,
+				mkws_config.service_proxy_auth_domain,
+				mkws_config.pazpar2_url);
 	} else {
 	    // raw pp2
-	    run_auto_searches();
+	    runAutoSearches();
 	}
     });
 })(jQuery);