X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=2896c44d5b7c926a20a40015ff964eafbb3813df;hb=0071d64575e2c1850fd18d536d504cf40fcd1e4a;hp=fb54a8e3f577cea827b3b55ac05f633ff4c0609b;hpb=3d550d4fcd67dae13cb96f558a315ae06f8f4585;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index fb54a8e..2896c44 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -228,8 +228,8 @@ function team($, teamName) {
 		      "pazpar2path": mkws_config.pazpar2_url,
 		      "oninit": my_oninit,
 		      "onstat": my_onstat,
-		      "onterm": my_onterm,
-		      "termlist": "xtargets,subject,author", // ### should only request the ones we actually want
+		      "onterm": (mkws_config.facets.length ? my_onterm : undefined),
+		      "termlist": mkws_config.facets.join(','),
 		      "onbytarget": my_onbytarget,
 		      "usesessions" : mkws_config.use_service_proxy ? false : true,
 		      "showResponseType": '', // or "json" (for debugging?)
@@ -310,9 +310,9 @@ function team($, teamName) {
 	var node = $(".mkwsTermlists.mkwsTeam_" + teamName);
 	if (node.length == 0) return;
 
-	// no facets
+	// no facets: this should never happen
 	if (!mkws_config.facets || mkws_config.facets.length == 0) {
-	    debug("my_onterm called even though we have no facets: " + $.toJSON(data));
+	    alert("my_onterm called even though we have no facets: " + $.toJSON(data));
 	    node.hide();
 	    return;
 	}
@@ -325,11 +325,11 @@ function team($, teamName) {
 	var facets = mkws_config.facets;
 
 	for(var i = 0; i < facets.length; i++) {
-	    if (facets[i] == "sources") {
+	    if (facets[i] == "xtargets") {
 		add_single_facet(acc, "Sources",  data.xtargets, 16, null);
-	    } else if (facets[i] == "subjects") {
+	    } else if (facets[i] == "subject") {
 		add_single_facet(acc, "Subjects", data.subject,  10, "subject");
-	    } else if (facets[i] == "authors") {
+	    } else if (facets[i] == "author") {
 		add_single_facet(acc, "Authors",  data.author,   10, "author");
 	    } else {
 		alert("bad facet configuration: '" + facets[i] + "'");
@@ -410,7 +410,6 @@ function team($, teamName) {
     // wait until the DOM is ready
     function domReady ()
     {
-	debug("starting domReady()");
 	$('.mkwsSearchForm.mkwsTeam_' + m_teamName).each(function (i, obj) {
 	    debug("adding search-forms for team '" + m_teamName + "'");
 	    var node = this;
@@ -420,13 +419,6 @@ function team($, teamName) {
 	    });
 	});
 
-	debug("in domReady() 1");
-	debug("document = '" + document + "'");
-	debug("document.mkwsSearchForm = '" + document.mkwsSearchForm + "'");
-	debug("document.mkwsSearchForm.mkwsQuery = '" + document.mkwsSearchForm.mkwsQuery + "'");
-	debug("document.mkwsSearchForm.mkwsQuery.value = '" + document.mkwsSearchForm.mkwsQuery.value + "'");
-	document.mkwsSearchForm.mkwsQuery.value = '';
-	debug("in domReady() 2");
 	if (document.mkwsSelect) {
 	    debug("messing with mkwsSelect");
 	    if (document.mkwsSelect.mkwsSort)
@@ -434,7 +426,6 @@ function team($, teamName) {
 	    if (document.mkwsSelect.mkwsPerpage)
 		document.mkwsSelect.mkwsPerpage.onchange = onSelectDdChange;
 	}
-	debug("finished domReady()");
     }
 
 
@@ -963,7 +954,7 @@ function team($, teamName) {
 	debug("after domReady()");
 
 	// on first page, hide the termlist
-	$(document).ready(function() { $("#mkwsTermlists").hide(); });
+	$(document).ready(function() { $(".mkwsTermlists.mkwsTeam_" + m_teamName).hide(); });
 	var motd = $(".mkwsMOTD.mkwsTeam_" + m_teamName);
 	var container = $(".mkwsMOTDContainer.mkwsTeam_" + m_teamName);
 	debug("for team '" + m_teamName + "', motd=" + motd + "(" + motd.length + "), container=" + container + "(" + container.length + ")");
@@ -1405,7 +1396,7 @@ function _mkws_jquery_plugin ($) {
 	    show_sort: true, 	/* show/hide sort menu */
 	    show_perpage: true, 	/* show/hide perpage menu */
 	    lang_options: [], 	/* display languages links for given languages, [] for all */
-	    facets: ["sources", "subjects", "authors"], /* display facets, in this order, [] for none */
+	    facets: ["xtargets", "subject", "author"], /* display facets, in this order, [] for none */
 	    responsive_design_width: undefined, /* a page with less pixel width considered as narrow */
 	    debug_level: 1,     /* debug level for development: 0..2 */