X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=ae6740b9cd1301e2b4d0532c50a59fe0fdd2990a;hb=fccd2725f64f0743c371e4eb756a5ec3b3f7a1b6;hp=1bcebdadec0fc38c753cd518739ec7e87d931a8f;hpb=82fbae5a856b058f4c177186e267398a337a3eaf;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 1bcebda..ae6740b 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -77,6 +77,7 @@ var mkws = {
     authenticated: false,
     debug_function: undefined, // will be set during initialisation
     debug_level: undefined, // will be initialised from mkws_config
+    paz: undefined, // will be set up during initialisation
     teams: {},
     locale_lang: {
 	"de": {
@@ -264,7 +265,7 @@ function _make_mkws_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
-    var m_paz = new pz2( { "onshow": my_onshow,
+    mkws.paz = new pz2( { "onshow": my_onshow,
 			   "showtime": 500,            //each timer (show, stat, term, bytarget) can be specified this way
 			   "pazpar2path": mkws_config.pazpar2_url,
 			   "oninit": my_oninit,
@@ -285,8 +286,8 @@ function _make_mkws_team($, teamName) {
     // pz2.js event handlers:
     //
     function my_oninit() {
-	m_paz.stat();
-	m_paz.bytarget();
+	mkws.paz.stat();
+	mkws.paz.bytarget();
     }
 
 
@@ -398,7 +399,7 @@ function _make_mkws_team($, teamName) {
 
     function my_onrecord(data) {
 	// FIXME: record is async!!
-	clearTimeout(m_paz.recordTimer);
+	clearTimeout(mkws.paz.recordTimer);
 	// in case on_show was faster to redraw element
 	var detRecordDiv = document.getElementById('mkwsDet_'+data.recid);
 	if (detRecordDiv) return;
@@ -486,7 +487,7 @@ function _make_mkws_team($, teamName) {
 	if (!m_submitted) return false;
 	resetPage();
 	loadSelect();
-	m_paz.show(0, m_recPerPage, m_sort);
+	mkws.paz.show(0, m_recPerPage, m_sort);
 	return false;
     }
 
@@ -542,7 +543,7 @@ function _make_mkws_team($, teamName) {
 	}
 	debug("triggerSearch(" + m_query + "): filters = " + $.toJSON(m_filters) + ", pp2filter = " + pp2filter + ", params = " + $.toJSON(params));
 
-	m_paz.search(m_query, m_recPerPage, m_sort, pp2filter, undefined, params);
+	mkws.paz.search(m_query, m_recPerPage, m_sort, pp2filter, undefined, params);
     }
 
 
@@ -706,21 +707,21 @@ function _make_mkws_team($, teamName) {
     mkws.showPage = function (pageNum)
     {
 	m_curPage = pageNum;
-	m_paz.showPage( m_curPage - 1 );
+	mkws.paz.showPage( m_curPage - 1 );
     }
 
 
     // simple paging functions
     mkws.pagerNext = function () {
 	if ( m_totalRec - m_recPerPage*m_curPage > 0) {
-            m_paz.showNext();
+            mkws.paz.showNext();
             m_curPage++;
 	}
     }
 
 
     mkws.pagerPrev = function () {
-	if ( m_paz.showPrev() != false )
+	if ( mkws.paz.showPrev() != false )
             m_curPage--;
     }
 
@@ -779,7 +780,7 @@ function _make_mkws_team($, teamName) {
             return;
 	}
 	// request the record
-	m_paz.record(recId);
+	mkws.paz.record(recId);
     }
 
 
@@ -1400,6 +1401,21 @@ function _mkws_jquery_plugin ($) {
 
     $(document).ready(function() {
 	log("on load ready");
+
+	// Backwards compatibility: set new magic class names on any
+	// elements that have the old magic IDs.
+	var ids = [ "Switch", "Lang", "Search", "Pager", "Navi",
+		    "Results", "Records", "Targets", "Ranking",
+		    "Termlists", "Stat" ];
+	for (var i = 0; i < ids.length; i++) {
+	    var id = 'mkws' + ids[i];
+	    var node = $('#' + id);
+	    if (node.attr('id')) {
+		node.addClass(id + " mkwsTeam_AUTO");
+		log("added magic classes to '" + node.attr('id') + "'");
+	    }
+	}
+
 	// Backwards compatibility: the special-case undefined team
 	mkws.teams[''] = _make_mkws_team(j, undefined);
 	log("Made the unnamed MKWS team");
@@ -1407,9 +1423,7 @@ function _mkws_jquery_plugin ($) {
 	// Find all nodes with class (NOT id) mkwsRecords, and
 	// determine their team from the mkwsTeam_* class. So:
 	//	<div class="mkwsRecords mkwsTeam_foo"/>
-	// ### Down the line we will also want teams that have facet
-	//     divs but no results. But not today.
-	$('.mkwsRecords').each(function () {
+	$('.mkwsResults, .mkwsRecords, .mkwsTermlists').each(function () {
 	    var node = this;
 	    var classes = this.className;
  	    var list = classes.split(/\s+/)
@@ -1420,11 +1434,13 @@ function _mkws_jquery_plugin ($) {
 		    tname = cname.replace(/^mkwsTeam_/, '');
 		}
 	    }
-	    if (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 {
 		mkws.teams[tname] = _make_mkws_team(j, tname);
 		log("Made MKWS team '" + tname + "'");
-	    } else {
-		alert("No MKWS team specified for mkwsRecords element with classes '" + classes + "'");
 	    }
 	});