X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-team.js;h=88745b7ec745fc842ea4011a905bb945e9a9782f;hb=637b62f52b3b834861c39f7a734d8d4f51182534;hp=828b049a19f000b4160cb54c215644a4b0d4dad3;hpb=2b35053e8c2dd524b28e37f2057814dffd81af91;p=mkws-moved-to-github.git

diff --git a/src/mkws-team.js b/src/mkws-team.js
index 828b049..88745b7 100644
--- a/src/mkws-team.js
+++ b/src/mkws-team.js
@@ -27,7 +27,8 @@ function team($, teamName) {
     };
     var m_paz; // will be initialised below
     var m_template = {};
-    var m_config = Object.create(mkws.config);
+    var m_config = mkws.objectInheritingFrom(mkws.config);
+    var m_widgets = {}; // Maps widget-type to object
 
     that.toString = function() { return '[Team ' + teamName + ']'; };
 
@@ -48,12 +49,12 @@ function team($, teamName) {
 
 
     // The following PubSub code is modified from the jQuery manual:
-    // https://api.jquery.com/jQuery.Callbacks/
+    // http://api.jquery.com/jQuery.Callbacks/
     //
     // Use as:
     //	team.queue("eventName").subscribe(function(param1, param2 ...) { ... });
     //	team.queue("eventName").publish(arg1, arg2, ...);
-
+    //
     var queues = {};
     function queue(id) {
 	if (!queues[id]) {
@@ -115,8 +116,9 @@ function team($, teamName) {
     }
 
     function onStat(data) {
-	log("stat");
 	queue("stat").publish(data);
+	if (parseInt(data.activeclients[0], 10) === 0)
+	    queue("complete").publish(parseInt(data.hits[0], 10));
     }
 
     function onTerm(data) {
@@ -127,6 +129,7 @@ function team($, teamName) {
     function onShow(data, teamName) {
 	log("show");
 	m_totalRecordCount = data.merged;
+	log("found " + m_totalRecordCount + " records");
 	queue("pager").publish(data);
 	queue("records").publish(data);
     }
@@ -238,6 +241,7 @@ function team($, teamName) {
 
 
     that.reShow = function() {
+	resetPage();
 	m_paz.show(0, m_perpage, m_sortOrder);
     };
 
@@ -249,7 +253,7 @@ function team($, teamName) {
     that.resetPage = resetPage;
 
 
-    function newSearch(query, sortOrder, perpage, targets) {
+    function newSearch(query, sortOrder, maxrecs, perpage, limit, targets, torusquery) {
 	log("newSearch: " + query);
 
 	if (m_config.use_service_proxy && !mkws.authenticated) {
@@ -258,19 +262,19 @@ function team($, teamName) {
 	}
 
 	m_filters = []
-	triggerSearch(query, sortOrder, perpage, targets);
+	triggerSearch(query, sortOrder, maxrecs, perpage, limit, targets, torusquery);
 	switchView('records'); // In case it's configured to start off as hidden
 	m_submitted = true;
     }
     that.newSearch = newSearch;
 
 
-    function triggerSearch(query, sortOrder, perpage, targets) {
+    function triggerSearch(query, sortOrder, maxrecs, perpage, limit, targets, torusquery) {
 	resetPage();
 	queue("navi").publish();
 
 	var pp2filter = "";
-	var pp2limit = "";
+	var pp2limit = limit || "";
 
 	// Continue to use previous query/sort-order unless new ones are specified
 	if (query) {
@@ -308,6 +312,14 @@ function team($, teamName) {
 	if (pp2limit) {
 	    params.limit = pp2limit;
 	}
+	if (maxrecs) {
+	    params.maxrecs = maxrecs;
+	}
+	if (torusquery) {
+	    if (!mkws.config.use_service_proxy)
+		alert("can't narrow search by torusquery when Service Proxy is not in use");
+	    params.torusquery = torusquery;
+	}
 
 	log("triggerSearch(" + m_query + "): filters = " + $.toJSON(m_filters) + ", " +
 	    "pp2filter = " + pp2filter + ", params = " + $.toJSON(params));
@@ -418,6 +430,15 @@ function team($, teamName) {
   </tr>\
 </table>');
 
+	var acc = [];
+	var facets = m_config.facets;
+	acc.push('<div class="title">' + M('Termlists') + '</div>');
+	for (var i = 0; i < facets.length; i++) {
+	    acc.push('<div class="mkwsFacet mkwsTeam_' + m_teamName + '" data-mkws-facet="' + facets[i] + '">');
+	    acc.push('</div>');
+	}
+	findnode(".mkwsTermlists").html(acc.join(''));
+
 	var ranking_data = '<form name="mkwsSelect" class="mkwsSelect mkwsTeam_' + m_teamName + '" action="" >';
 	if (m_config.show_sort) {
 	    ranking_data +=  M('Sort by') + ' ' + mkwsHtmlSort() + ' ';
@@ -584,13 +605,19 @@ function team($, teamName) {
 	teamName = teamName || m_teamName;
 
 	selector = $.map(selector.split(','), function(s, i) {
-	    return s + '.mkwsTeam_' + teamName;
+	    if (teamName === 'AUTO') {
+		return (s + '.mkwsTeam_' + teamName + ',' +
+			s + ':not([class^="mkwsTeam"],[class*=" mkwsTeam"])');
+	    } else {
+		return s + '.mkwsTeam_' + teamName;
+	    }
 	}).join(',');
 
 	var node = $(selector);
 	//log('findnode(' + selector + ') found ' + node.length + ' nodes');
 	return node;
     }
+    that.findnode = findnode;
 
 
     function renderDetails(data, marker) {
@@ -699,6 +726,15 @@ function team($, teamName) {
   <span><i>{{md-title-responsibility}}</i></span>\
 {{/if}}\
 ';
+	} else if (name === "Image") {
+	    return '\
+      <a href="#" id="{{_id}}" onclick="{{_onclick}}">\
+        {{#first md-thumburl}}\
+	  <img src="{{this}}" alt="{{../md-title}}"/>\
+        {{/first}}\
+	<br/>\
+      </a>\
+';
 	}
 
 	var s = "There is no default '" + name +"' template!";
@@ -706,6 +742,22 @@ function team($, teamName) {
 	return s;
     }
 
+    that.addWidget = function(w) {
+        if (!m_widgets[w.type]) {
+            m_widgets[w.type] = widget;
+            log("Registered '" + w.type + "' widget in team '" + m_teamName + "'");
+        } else if (typeof(m_widgets[w.type]) !== 'number') {
+            m_widgets[w.type] = 2;
+            log("Registered duplicate '" + w.type + "' widget in team '" + m_teamName + "'");
+        } else {
+            m_widgets[w.type] += 1;
+            log("Registered '" + w.type + "' widget #" + m_widgets[w.type] + "' in team '" + m_teamName + "'");
+        }
+    }
+
+    that.widget = function(type) {
+        return m_widgets[type];
+    }
 
     mkwsHtmlAll()