X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=ee055204fbfaa84cecc95cf82fc5d22eaba7c2df;hb=75a31106246500cc5ca1445fcf337a329d6865b0;hp=9cbd28323a30ae79b52e7f5bf063378fab3a691c;hpb=5d67f02b01d5d376478471eda5393958507e3587;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 9cbd283..ee05520 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -179,10 +179,58 @@ function widget($, team, type, node) {
 	node: node
     };
 
-    // ### More to do here, surely: e.g. wiring into the team
-    mkws.debug("made widget(team=" + team + ", type=" + type + ", node=" + node);
+    var M = mkws.M;
+
+    if (type === 'Targets') {
+	promoteTargets();
+    } else if (type === 'Stat') {
+	promoteStat();
+    } else {
+	// ### Handle other types here
+    }
 
+    mkws.debug("made widget(team=" + team + ", type=" + type + ", node=" + node);
     return that;
+
+
+    function promoteTargets() {
+	mkws.queue("targets." + team.name()).subscribe(function(data) {
+	    if (node.length === 0) alert("huh?!");
+
+	    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>";
+	    }
+	    
+	    table += '</tbody></table>';
+	    var subnode = $(node).children('.mkwsBytarget');
+	    subnode.html(table);
+	});
+    }
+
+
+    function promoteStat() {
+	mkws.queue("stat." + team.name()).subscribe(function(data) {
+	    if (node.length === 0)  alert("huh?!");
+
+	    $(node).html('<span class="head">' + M('Status info') + '</span>' +
+		' -- ' +
+		'<span class="clients">' + M('Active clients') + ': ' + data.activeclients + '/' + data.clients + '</span>' +
+		' -- ' +
+		'<span class="records">' + M('Retrieved records') + ': ' + data.records + '/' + data.hits + '</span>');
+	});
+    }
 }
 
 
@@ -197,6 +245,7 @@ function widget($, team, type, node) {
 function team($, teamName) {
     var that = {};
     var m_teamName = teamName;
+    that.name = function() { return m_teamName; }
     var m_submitted = false;
     var m_query; // initially undefined
     var m_sort; // will be set below
@@ -249,53 +298,26 @@ function team($, teamName) {
     //
     // pz2.js event handlers:
     //
-    function onInit(teamName) {
+    function onInit() {
 	debug("init");
 	m_paz.stat();
 	m_paz.bytarget();
     }
 
 
-    function onBytarget(data, teamName) {
+    function onBytarget(data) {
 	debug("target");
-	var node = findnode('.mkwsBytarget');
-	if (node.length === 0) 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>";
-	}
-
-	table += '</tbody></table>';
-	node.html(table);
+	mkws.queue("targets." + m_teamName).publish(data);
     }
 
 
-    function onStat(data, teamName) {
+    function onStat(data) {
 	debug("stat");
-	var node = findnode('.mkwsStat');
-	if (node.length === 0) return;
-
-	node.html('<span class="head">' + M('Status info') + '</span>' +
-	    ' -- ' +
-	    '<span class="clients">' + M('Active clients') + ': ' + data.activeclients + '/' + data.clients + '</span>' +
-	    ' -- ' +
-	    '<span class="records">' + M('Retrieved records') + ': ' + data.records + '/' + data.hits + '</span>');
+	mkws.queue("stat." + m_teamName).publish(data);
     }
 
 
-    function onTerm(data, teamName) {
+    function onTerm(data) {
 	debug("term");
 	var node = findnode(".mkwsTermlists");
 	if (node.length == 0) return;