X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=56d3522df6519d332ea495dfe7fe0fb18cce646e;hb=59042a289588b636ea5c80a1ec4c871415a4fe72;hp=604d5090c0811fe6d49368ca1987341b83ca5984;hpb=fd71e199523e8cbfea692732cfe9ff361a050b35;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 604d509..56d3522 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -10,7 +10,6 @@ Handlebars.registerHelper('json', function(obj) {
 
 
 Handlebars.registerHelper('translate', function(s) {
-    debug("translating '" + s + "'");
     return mkws.M(s);
 });
 
@@ -142,9 +141,9 @@ if (mkws_config == null || typeof mkws_config != 'object') {
 
 
 // wrapper for jQuery lib
-function _make_mkws_team($, teamName) {
+function team($, teamName) {
     var that = {};
-    var m_termName = teamName;
+    var m_teamName = teamName;
     var m_submitted = false;
     var m_query; // initially undefined
     var m_sort = 'relevance';
@@ -163,10 +162,11 @@ function _make_mkws_team($, teamName) {
 
 
     // if (console && console.log) // disabled, will fail in IE8
-    //	console.log("run _make_mkws_team(" + (teamName ? teamName : "") + ")");
+    //	console.log("run team(" + (teamName ? teamName : "") + ")");
 
 
-    // Needs to be defined inside _make_mkws_team() so it can see m_debug_time
+    // Needs to be defined inside team() so it can see m_debug_time
+    // ### member access won't work: there is only one instance of this function
     mkws.debug_function = function (string) {
 	if (!mkws.debug_level)
 	    return;
@@ -262,7 +262,7 @@ function _make_mkws_team($, teamName) {
 	}
 
 	// navi
-	var results = $("#mkwsRecords");
+	var results = $(".mkwsRecords.mkwsTeam_" + m_teamName);
 
 	var html = [];
 	for (var i = 0; i < data.hits.length; i++) {
@@ -271,7 +271,8 @@ function _make_mkws_team($, teamName) {
 		      renderSummary(hit),
       		      '</div>');
 	    if (hit.recid == m_curDetRecId) {
-		html.push(renderDetails(m_curDetRecData));
+		if (m_curDetRecData)
+		    html.push(renderDetails(m_curDetRecData));
 	    }
 	}
 	results.html(html.join(''));
@@ -282,7 +283,7 @@ function _make_mkws_team($, teamName) {
     {
 	var template = loadTemplate("Summary");
 	hit._id = "mkwsRec_" + hit.recid;
-	hit._onclick = "mkws.showDetails(this.id);return false;"
+	hit._onclick = "mkws.showDetails(this.id, '" + m_teamName + "');return false;"
 	return template(hit);
     }
 
@@ -356,7 +357,7 @@ function _make_mkws_team($, teamName) {
     }
 
 
-    function my_onrecord(data, teamName) {
+    function my_onrecord(data, args, teamName) {
 	debug("record for " + teamName);
 	// FIXME: record is async!!
 	clearTimeout(m_paz.recordTimer);
@@ -405,7 +406,15 @@ function _make_mkws_team($, teamName) {
     // wait until the DOM is ready
     function domReady ()
     {
-	document.mkwsSearchForm.onsubmit = onFormSubmitEventHandler;
+	$('.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);
+	    });
+	});
+
 	document.mkwsSearchForm.mkwsQuery.value = '';
 	if (document.mkwsSelect) {
 	    if (document.mkwsSelect.mkwsSort)
@@ -419,7 +428,11 @@ function _make_mkws_team($, teamName) {
     // when search button pressed
     function onFormSubmitEventHandler()
     {
-	that.newSearch(document.mkwsSearchForm.mkwsQuery.value);
+	mkws.handle_node_with_team(this, function (tname) {
+	    var val = $('.mkwsQuery.mkwsTeam_' + tname).val();
+	    mkws.teams[tname].newSearch(val);
+	});
+
 	return false;
     }
 
@@ -691,30 +704,31 @@ function _make_mkws_team($, teamName) {
     mkws.switchView = function(view) {
 	debug("switchView: " + view);
 
-	var targets = document.getElementById('mkwsTargets');
-	var results = document.getElementById('mkwsResults') ||
-	    document.getElementById('mkwsRecords');
-	var blanket = document.getElementById('mkwsBlanket');
-	var motd    = document.getElementById('mkwsMOTD');
+	//var targets = document.getElementById('mkwsTargets');
+	var targets = $('#mkwsTargets');
+	var results = $('#mkwsResults,#mkwsRecords');
+	var blanket = $('#mkwsBlanket');
+	var motd    = $('#mkwsMOTD');
 
 	switch(view) {
         case 'targets':
-            if (targets) targets.style.display = "block";
-            if (results) results.style.display = "none";
-            if (blanket) blanket.style.display = "none";
-            if (motd) motd.style.display = "none";
+            if (targets) targets.css('display', 'block');
+            if (results) results.css('display', 'none');
+            if (blanket) blanket.css('display', 'none');
+            if (motd) motd.css('display', 'none');
             break;
         case 'records':
-            if (targets) targets.style.display = "none";
-            if (results) results.style.display = "block";
-            if (blanket) blanket.style.display = "block";
-            if (motd) motd.style.display = "none";
+            if (targets) targets.css('display', 'none');
+            if (results) results.css('display', 'block');
+            if (blanket) blanket.css('display', 'block');
+            if (motd) motd.css('display', 'none');
             break;
 	case 'none':
-            if (targets) targets.style.display = "none";
-            if (results) results.style.display = "none";
-            if (blanket) blanket.style.display = "none";
-            if (motd) motd.style.display = "none";
+	    alert("mkws.switchView('none') shouldn't happen");
+            if (targets) targets.css('display', 'none');
+            if (results) results.css('display', 'none');
+            if (blanket) blanket.css('display', 'none');
+            if (motd) motd.css('display', 'none');
             break;
         default:
             alert("Unknown view '" + view + "'");
@@ -723,7 +737,7 @@ function _make_mkws_team($, teamName) {
 
 
     // detailed record drawing
-    mkws.showDetails = function (prefixRecId) {
+    that.showDetails = function (prefixRecId) {
 	var recId = prefixRecId.replace('mkwsRec_', '');
 	var oldRecId = m_curDetRecId;
 	m_curDetRecId = recId;
@@ -864,11 +878,16 @@ function _make_mkws_team($, teamName) {
 	// For some reason, doing this programmatically results in
 	// document.mkwsSearchForm.mkwsQuery being undefined, hence the raw HTML.
 	debug("HTML search form");
-	$("#mkwsSearch").html('\
-<form name="mkwsSearchForm" action="" >\
-  <input id="mkwsQuery" type="text" size="' + mkws_config.query_width + '" />\
-  <input id="mkwsButton" type="submit" value="' + M('Search') + '" />\
+	$('.mkwsSearch').each(function (i, obj) {
+	    var node = this;
+	    mkws.handle_node_with_team(node, function(tname) {
+		$(node).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') + '" />\
 </form>');
+	    });
+	});
 
 	debug("HTML records");
 	// If the application has an #mkwsResults, populate it in the
@@ -883,19 +902,19 @@ function _make_mkws_team($, teamName) {
 	    $("#mkwsResults").html('\
 <table width="100%" border="0" cellpadding="6" cellspacing="0">\
   <tr>\
-    <td id="mkwsTermlistContainer1" width="250" valign="top">\
-      <div id="mkwsTermlists"></div>\
+    <td id="mkwsTermlistContainer1" class="mkwsTermlistContainer1 mkwsTeam_AUTO" width="250" valign="top">\
+      <div id="mkwsTermlists" class="mkwsTermlists mkwsTeam_AUTO"></div>\
     </td>\
     <td id="mkwsMOTDContainer" valign="top">\
-      <div id="mkwsRanking"></div>\
-      <div id="mkwsPager"></div>\
-      <div id="mkwsNavi"></div>\
-      <div id="mkwsRecords"></div>\
+      <div id="mkwsRanking" class="mkwsRanking mkwsTeam_AUTO"></div>\
+      <div id="mkwsPager" class="mkwsPager mkwsTeam_AUTO"></div>\
+      <div id="mkwsNavi" class="mkwsNavi mkwsTeam_AUTO"></div>\
+      <div id="mkwsRecords" class="mkwsRecords mkwsTeam_AUTO"></div>\
     </td>\
   </tr>\
   <tr>\
     <td colspan="2">\
-      <div id="mkwsTermlistContainer2"></div>\
+      <div id="mkwsTermlistContainer2" class="mkwsTermlistContainer2 mkwsTeam_AUTO"></div>\
     </td>\
   </tr>\
 </table>');
@@ -974,7 +993,7 @@ function _make_mkws_team($, teamName) {
 
 	debug("HTML targets");
 	$("#mkwsTargets").html('\
-<div id="mkwsBytarget">\
+<div id="mkwsBytarget" class="mkwsBytarget mkwsTeam_AUTO">\
   No information available yet.\
 </div>');
 	$("#mkwsTargets").css("display", "none");
@@ -1265,7 +1284,7 @@ function _mkws_jquery_plugin ($) {
 };
 
 
-// wrapper to call _make_mkws_team() after page load
+// wrapper to call team() after page load
 (function (j) {
     function log(s) {
         if (typeof console === "undefined" || typeof console.log === "undefined") { /* ARGH!!! old IE */
@@ -1295,36 +1314,19 @@ function _mkws_jquery_plugin ($) {
 	    }
 	}
 
-	// Backwards compatibility: the special-case undefined team
-	// ### Will not be necessary when non-default teams are working
-	mkws.teams['AUTO'] = _make_mkws_team(j, "AUTO");
-	log("Made the unnamed MKWS team");
-
 	// Find all nodes with class (NOT id) mkwsRecords, and
 	// determine their team from the mkwsTeam_* class. So:
 	//	<div class="mkwsRecords mkwsTeam_foo"/>
-	$('.mkwsResults, .mkwsRecords, .mkwsTermlists').each(function () {
+	$('.mkwsSearch, .mkwsResults, .mkwsRecords, .mkwsTermlists').each(function () {
 	    var node = this;
-	    var classes = this.className;
- 	    var list = classes.split(/\s+/)
-	    var tname;
-	    for (var i = 0; i < list.length; i++) {
-		var cname = list[i];
-		if (cname.match(/^mkwsTeam_/)) {
-		    tname = cname.replace(/^mkwsTeam_/, '');
+	    mkws.handle_node_with_team(node, function(tname) {
+		if (mkws.teams[tname]) {
+		    log("MKWS team '" + tname + "' already exists, skipping");
+		} else {
+		    mkws.teams[tname] = team(j, tname);
+		    log("Made MKWS team '" + tname + "'");
 		}
-	    }
-	    if (!tname) {
-		alert("No MKWS team specified for mkwsRecords element with classes '" + classes + "'");
-	    } else if (mkws.teams[tname]) {
-		log("MKWS team '" + tname + "' already exists, skipping");
-	    } else if (tname === "AUTO") {
-		// ### For now: later, this will be how the backwards-compatibility is done
-		log("Skipping MKWS team '" + tname + "'");
-	    } else {
-		mkws.teams[tname] = _make_mkws_team(j, tname);
-		log("Made MKWS team '" + tname + "'");
-	    }
+	    });
 	});
 
 	if (mkws_config.use_service_proxy) {
@@ -1338,12 +1340,33 @@ function _mkws_jquery_plugin ($) {
     });
 
 
+    mkws.handle_node_with_team = function(node, callback) {
+	var classes = node.className;
+ 	var list = classes.split(/\s+/)
+	var tname;
+	for (var i = 0; i < list.length; i++) {
+	    var cname = list[i];
+	    if (cname.match(/^mkwsTeam_/)) {
+		tname = cname.replace(/^mkwsTeam_/, '');
+	    }
+	}
+	if (!tname)
+	    tname = "AUTO";
+	callback(tname);
+    }
+
+
+    mkws.showDetails = function (prefixRecId, tname) {
+	mkws.teams[tname].showDetails(prefixRecId);
+    }
+
+
     function default_mkws_config() {
 	/* default mkws config */
 	var config_default = {
 	    use_service_proxy: true,
-	    pazpar2_url: "http://mkws.indexdata.com/service-proxy/",
-	    service_proxy_auth: "http://mkws.indexdata.com/service-proxy-auth",
+	    pazpar2_url: "//mkws.indexdata.com/service-proxy/",
+	    service_proxy_auth: "//mkws.indexdata.com/service-proxy-auth",
 	    lang: "",
 	    sort_options: [["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]],
 	    perpage_options: [10, 20, 30, 50],