X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=5c40cb3b74acbaa63339b1fd8a7482ab0ec8389b;hb=27b7bc85372b54c732469f43950d3d6e15d13344;hp=3881729a31ae35e01f4910a9bb43056b640a3aa5;hpb=82b68679aa23ae903fe3efe2976d5cf50d688f43;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 3881729..5c40cb3 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -242,18 +242,18 @@ 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": 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,
+		      "usesessions" : mkws_config.use_service_proxy ? false : true,
 		      "oninit": onInit,
+		      "onbytarget": onBytarget,
 		      "onstat": onStat,
 		      "onterm": (mkws_config.facets.length ? onTerm : undefined),
-		      "termlist": mkws_config.facets.join(','),
-		      "onbytarget": onBytarget,
-		      "usesessions" : mkws_config.use_service_proxy ? false : true,
-		      "showResponseType": '', // or "json" (for debugging?)
-		      "onrecord": onRecord });
+		      "onshow": onShow,
+		      "onrecord": onRecord,
+		      "showtime": 500,            //each timer (show, stat, term, bytarget) can be specified this way
+		      "termlist": mkws_config.facets.join(',')
+		    });
 
 
     // Finds the node of the specified class within the current team
@@ -281,40 +281,31 @@ function team($, teamName) {
     }
 
 
-    function onShow(data, teamName) {
-	debug("show");
-	m_totalRec = data.merged;
-
-	var pager = findnode(".mkwsPager");
-	if (pager.length) {
-	    pager.html(drawPager(data))
+    function onBytarget(data, teamName) {
+	debug("target");
+	var targetDiv = findnode('.mkwsBytarget');
+	if (!targetDiv) {
+	    return;
 	}
 
-	var results = findnode(".mkwsRecords");
-	if (!results.length)
-	    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>';
 
-	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));
-	    }
+	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);
     }
 
 
@@ -367,6 +358,57 @@ function team($, teamName) {
     }
 
 
+    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 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 addSingleFacet(acc, caption, data, max, pzIndex) {
 	acc.push('<div class="facet mkwsFacet' + caption + ' mkwsTeam_' + m_teamName + '">');
 	acc.push('<div class="termtitle">' + M(caption) + '</div>');
@@ -402,47 +444,6 @@ function team($, teamName) {
     }
 
 
-    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 onBytarget(data, teamName) {
-	debug("target");
-	var targetDiv = findnode('.mkwsBytarget');
-	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>";
-	}
-
-	table += '</tbody></table>';
-	targetDiv.html(table);
-    }
-
     ////////////////////////////////////////////////////////////////////////////////
     ////////////////////////////////////////////////////////////////////////////////