X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-widgets.js;h=c04c3f9332905d3a0139449a46d8389fccaee1cf;hb=94988acacdecf63dec5e58eff7fac807f0928139;hp=435f37822f0ccb37be9605901ec9e8c5f99fcd74;hpb=561b8b91ccf55d612c9ff1276494d78f198d46ac;p=mkws-moved-to-github.git

diff --git a/src/mkws-widgets.js b/src/mkws-widgets.js
index 435f378..c04c3f9 100644
--- a/src/mkws-widgets.js
+++ b/src/mkws-widgets.js
@@ -10,7 +10,7 @@ function widget($, team, type, node) {
 	team: team,
 	type: type,
 	node: node,
-	config: Object.create(team.config())
+	config: mkws.objectInheritingFrom(team.config())
     };
 
     function log(s) {
@@ -22,6 +22,10 @@ function widget($, team, type, node) {
 	return '[Widget ' + team.name() + ':' + type + ']';
     };
 
+    that.value = function() {
+        return node.value;
+    }
+
     for (var i = 0; i < node.attributes.length; i++) {
 	var a = node.attributes[i];
 	if (a.name === 'data-mkws-config') {
@@ -60,33 +64,36 @@ 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";
@@ -97,8 +104,8 @@ widget.maybeAutosearch = function(widget) {
 	    widget.log(s);
 
 	    widget.team.newSearch(query, sortOrder, maxrecs, perpage, limit, targets, targetfilter);
-	});
-    }
+	}
+    });
 };
 
 
@@ -151,73 +158,6 @@ mkws.registerWidgetType('Stat', function() {
 });
 
 
-mkws.registerWidgetType('Termlists', function() {
-    var that = this;
-    var M = mkws.M;
-
-    this.team.queue("termlists").subscribe(function(data) {
-	if (!that.node) {
-	    alert("termlists event when there are no termlists");
-	    return;
-	}
-
-	// no facets: this should never happen
-	var facets = that.config.facets;
-	if (!facets || facets.length == 0) {
-	    alert("onTerm called even though we have no facets: " + $.toJSON(data));
-	    $(that.node).hide();
-	    return;
-	}
-
-	// display if we first got results
-	$(that.node).show();
-
-	var acc = [];
-	acc.push('<div class="title">' + M('Termlists') + '</div>');
-
-	for (var i = 0; i < facets.length; i++) {
-	    if (facets[i] == "xtargets") {
-		addSingleFacet(acc, "Sources",  data.xtargets, 16, null);
-	    } else if (facets[i] == "subject") {
-		addSingleFacet(acc, "Subjects", data.subject,  10, "subject");
-	    } else if (facets[i] == "author") {
-		addSingleFacet(acc, "Authors",  data.author,   10, "author");
-	    } else {
-		alert("bad facet configuration: '" + facets[i] + "'");
-	    }
-	}
-
-	$(that.node).html(acc.join(''));
-
-	function addSingleFacet(acc, caption, data, max, pzIndex) {
-	    var teamName = that.team.name();
-	    acc.push('<div class="facet mkwsFacet' + caption + ' mkwsTeam_' + 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 = '';
-		if (!pzIndex) {
-		    // Special case: target selection
-		    acc.push('target_id='+data[i].id+' ');
-		    if (!that.team.targetFiltered(data[i].id)) {
-			action = 'mkws.limitTarget(\'' + teamName + '\', this.getAttribute(\'target_id\'),this.firstChild.nodeValue)';
-		    }
-		} else {
-		    action = 'mkws.limitQuery(\'' + teamName + '\', \'' + pzIndex + '\', this.firstChild.nodeValue)';
-		}
-		acc.push('onclick="' + action + ';return false;">' + data[i].name + '</a>'
-			 + ' <span>' + data[i].freq + '</span>');
-		acc.push('</div>');
-	    }
-	    acc.push('</div>');
-	}
-    });
-
-    widget.maybeAutosearch(that);
-});
-
-
 mkws.registerWidgetType('Pager', function() {
     var that = this;
     var M = mkws.M;
@@ -245,24 +185,24 @@ mkws.registerWidgetType('Pager', function() {
 		? firstClkbl + 2*onsides
 		: pages;
 
-	    var prev = '<span class="mkwsPrev">&#60;&#60; ' + M('Prev') + '</span><b> | </b>';
+	    var prev = '<span class="mkwsPrev">&#60;&#60; ' + M('Prev') + '</span> | ';
 	    if (currentPage > 1)
 		prev = '<a href="#" class="mkwsPrev" onclick="mkws.pagerPrev(\'' + teamName + '\');">'
-		+'&#60;&#60; ' + M('Prev') + '</a><b> | </b>';
+		+'&#60;&#60; ' + M('Prev') + '</a> | ';
 
 	    var middle = '';
 	    for(var i = firstClkbl; i <= lastClkbl; i++) {
 		var numLabel = i;
 		if(i == currentPage)
-		    numLabel = '<b>' + i + '</b>';
+		    numLabel = '<span class="mkwsSelected">' + i + '</span>';
 
 		middle += '<a href="#" onclick="mkws.showPage(\'' + teamName + '\', ' + i + ')"> '
 		    + numLabel + ' </a>';
 	    }
 
-	    var next = '<b> | </b><span class="mkwsNext">' + M('Next') + ' &#62;&#62;</span>';
+	    var next = ' | <span class="mkwsNext">' + M('Next') + ' &#62;&#62;</span>';
 	    if (pages - currentPage > 0)
-		next = '<b> | </b><a href="#" class="mkwsNext" onclick="mkws.pagerNext(\'' + teamName + '\')">'
+		next = ' | <a href="#" class="mkwsNext" onclick="mkws.pagerNext(\'' + teamName + '\')">'
 		+ M('Next') + ' &#62;&#62;</a>';
 
 	    var predots = '';
@@ -282,6 +222,13 @@ mkws.registerWidgetType('Pager', function() {
 });
 
 
+mkws.registerWidgetType('Results', function() {
+    // Nothing to do apart from act as an autosearch trigger
+    // Contained elements do all the real work
+    widget.autosearch(this);
+});
+
+
 mkws.registerWidgetType('Records', function() {
     var that = this;
     var team = this.team;
@@ -303,14 +250,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);
 });
 
 
@@ -320,18 +267,23 @@ mkws.registerWidgetType('Navi', function() {
     var M = mkws.M;
 
     this.team.queue("navi").subscribe(function() {
+	// This is very low-level poking around inside the filter structure
 	var filters = that.team.filters();
 	var text = "";
 
 	for (var i in filters) {
-	    if (text) {
-		text += " | ";
-	    }
 	    var filter = filters[i];
 	    if (filter.id) {
+		if (text) text += " | ";
 		text += M('source') + ': <a class="crossout" href="#" onclick="mkws.delimitTarget(\'' + teamName +
 		    "', '" + filter.id + "'" + ');return false;">' + filter.name + '</a>';
-	    } else {
+	    }
+	}
+
+	for (var i in filters) {
+	    var filter = filters[i];
+	    if (!filter.id) {
+		if (text) text += " | ";
 		text += M(filter.field) + ': <a class="crossout" href="#" onclick="mkws.delimitQuery(\'' + teamName +
 		    "', '" + filter.field + "', '" + filter.value + "'" +
 		    ');return false;">' + filter.value + '</a>';
@@ -352,7 +304,6 @@ mkws.registerWidgetType('Sort', function() {
     $(this.node).change(function() {
 	that.team.set_sortOrder($(that.node).val());
 	if (that.team.submitted()) {
-	    that.team.resetPage();
 	    that.team.reShow();
 	}
 	return false;
@@ -366,9 +317,17 @@ mkws.registerWidgetType('Perpage', function() {
     $(this.node).change(function() {
 	that.team.set_perpage($(that.node).val());
 	if (that.team.submitted()) {
-	    that.team.resetPage();
 	    that.team.reShow();
 	}
 	return false;
     });
 });
+
+
+mkws.registerWidgetType('Done', function() {
+    var that = this;
+
+    this.team.queue("complete").subscribe(function(n) {
+	$(that.node).html("Search complete: found " + n + " records");
+    });
+});