X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=5a18aa9e87a8e107484827cc0a12cda96152d316;hb=0f1ee05a66d356ff5fbf62353e6a599980ec9c02;hp=68892ea67971211c09b0d6f5198c14a307cedf66;hpb=d184860c42c779063d3ce515ce625836d5451b2e;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 68892ea..5a18aa9 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -144,7 +144,7 @@ if (mkws_config == null || typeof mkws_config != 'object') {
 // wrapper for jQuery lib
 function _make_mkws_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';
@@ -262,7 +262,7 @@ function _make_mkws_team($, teamName) {
 	}
 
 	// navi
-	var results = document.getElementById("mkwsRecords");
+	var results = $("#mkwsRecords");
 
 	var html = [];
 	for (var i = 0; i < data.hits.length; i++) {
@@ -274,7 +274,7 @@ function _make_mkws_team($, teamName) {
 		html.push(renderDetails(m_curDetRecData));
 	    }
 	}
-	replaceHtml(results, html.join(''));
+	results.html(html.join(''));
     }
 
 
@@ -328,9 +328,9 @@ function _make_mkws_team($, teamName) {
 	    }
 	}
 
-	var termlist = document.getElementById("mkwsTermlists");
+	var termlist = $("#mkwsTermlists");
 	if (termlist)
-	    replaceHtml(termlist, acc.join(''));
+	    termlist.html(acc.join(''));
     }
 
 
@@ -419,12 +419,12 @@ function _make_mkws_team($, teamName) {
     // when search button pressed
     function onFormSubmitEventHandler()
     {
-	newSearch(document.mkwsSearchForm.mkwsQuery.value);
+	that.newSearch(document.mkwsSearchForm.mkwsQuery.value);
 	return false;
     }
 
 
-    function newSearch(query, sort, targets, windowid)
+    that.newSearch = function(query, sort, targets, windowid)
     {
 	debug("newSearch: " + query);
 
@@ -745,21 +745,6 @@ function _make_mkws_team($, teamName) {
     }
 
 
-    function replaceHtml(el, html) {
-	var oldEl = typeof el === "string" ? document.getElementById(el) : el;
-	/*@cc_on // Pure innerHTML is slightly faster in IE
-	  oldEl.innerHTML = html;
-	  return oldEl;
-	  @*/
-	var newEl = oldEl.cloneNode(false);
-	newEl.innerHTML = html;
-	oldEl.parentNode.replaceChild(newEl, oldEl);
-	/* Since we just removed the old element from the DOM, return a reference
-	   to the new element, which can be used to restore variable references. */
-	return newEl;
-    };
-
-
     function renderDetails(data, marker)
     {
 	var template = loadTemplate("Record");
@@ -1312,7 +1297,7 @@ function _mkws_jquery_plugin ($) {
 
 	// Backwards compatibility: the special-case undefined team
 	// ### Will not be necessary when non-default teams are working
-	mkws.teams[''] = _make_mkws_team(j, undefined);
+	mkws.teams['AUTO'] = _make_mkws_team(j, "AUTO");
 	log("Made the unnamed MKWS team");
 
 	// Find all nodes with class (NOT id) mkwsRecords, and
@@ -1404,11 +1389,11 @@ function _mkws_jquery_plugin ($) {
      * for the site.
      */
     function authenticate_session(auth_url, auth_domain, pp2_url) {
-	debug("Run service proxy auth URL: " + auth_url);
+	console.log("Run service proxy auth URL: " + auth_url);
 
 	if (!auth_domain) {
 	    auth_domain = pp2_url.replace(/^(https?:)?\/\/(.*?)\/.*/, '$2');
-	    debug("guessed auth_domain '" + auth_domain + "' from pp2_url '" + pp2_url + "'");
+	    console.log("guessed auth_domain '" + auth_domain + "' from pp2_url '" + pp2_url + "'");
 	}
 
 	var request = new pzHttpRequest(auth_url, function(err) {
@@ -1427,7 +1412,7 @@ function _mkws_jquery_plugin ($) {
 		return;
 	    }
 
-	    debug("Service proxy auth successfully done");
+	    console.log("Service proxy auth successfully done");
 	    mkws.authenticated = true;
 	    run_auto_searches();
 	});
@@ -1437,26 +1422,24 @@ function _mkws_jquery_plugin ($) {
     function run_auto_searches() {
 	console.log("running auto searches");
 
-	$('[id^="mkwsRecords"]').each(function () {
-	    var node = $(this);
+	for (var teamName in mkws.teams) {
+	    // ### should check mkwsTermlist as well, for facet-only teams
+	    var node = $('.mkwsRecords.mkwsTeam_' + teamName);
 	    var query = node.attr('autosearch');
+	    console.log("teamName '" + teamName + "', node=" + node + ", class='" + node.className + "', query=" + query);
 
 	    if (query) {
-		var windowid = undefined;
-		var id = node.attr('id');
-		if (id.match(/^mkwsRecords_/, '')) {
-		    windowid = id.replace(/^mkwsRecords_/, '');
-		}
-
 		var sort = node.attr('sort');
 		var targets = node.attr('targets');
 		var s = "running auto search: '" + query + "'";
-		if (windowid) s += " [windowid '" + windowid + "']";
+		if (teamName) s += " [teamName '" + teamName + "']";
 		if (sort) s += " sorted by '" + sort + "'";
 		if (targets) s += " in targets '" + targets + "'";
 		console.log(s);
-		newSearch(query, sort, targets, windowid);
+		var team = mkws.teams[teamName];
+		console.log($.toJSON(team));
+		team.newSearch(query, sort, targets, teamName);
 	    }
-	});
+	}
     }
 })(jQuery);