X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=9a9c682cb4afc13466b75f0a227f88e5e9fa0833;hb=0689574b8d0579dd869bf4d80b98c62134f7a99b;hp=f0448d10f810beaf6113758862f773148dc6af96;hpb=95373e2651717ba158fd6fd616f05d13d62a398a;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index f0448d1..9a9c682 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -235,6 +235,11 @@ function my_onrecord(data) {
 
 function my_onbytarget(data) {
     var targetDiv = document.getElementById("mkwsBytarget");
+    if (!targetDiv) {
+	// No mkwsTargets div.
+	return;
+    }
+
     var table ='<table><thead><tr><td>Target ID</td><td>Hits</td><td>Diags</td>'
         +'<td>Records</td><td>State</td></tr></thead><tbody>';
 
@@ -524,7 +529,6 @@ function mkws_html_all(config) {
 	sort_default: "relevance",
 	perpage_default: 20,
 	query_width: 50,
-	switch_menu: false, 	/* show/hide Records|Targets menu */
 	lang_menu: true, 	/* show/hide language menu */
 	sort_menu: true, 	/* show/hide sort menu */
 	perpage_menu: true, 	/* show/hide perpage menu */
@@ -672,11 +676,6 @@ function mkws_html_switch(config) {
        No information available yet.\
       </div>');
     $("#mkwsTargets").css("display", "none");
-
-    if (!config.switch_menu) {
-	debug("disable switch menu");
-        $("#mkwsSwitch").css("display", "none");
-    }
 }
 
 function mkws_html_sort(config) {
@@ -727,7 +726,10 @@ function mkws_service_proxy_auth(auth_url) {
 
     debug("Run service proxy auth URL: " + auth_url);
 
-    var request = new pzHttpRequest(auth_url);
+    var request = new pzHttpRequest(auth_url, function(err) {
+	alert("HTTP call for authentication failed: " + err)
+	return;
+    });
     request.get(null, function(data) {
 	if (!$.isXMLDoc(data)) {
 	    alert("service proxy auth response document is not valid XML document, give up!");
@@ -842,6 +844,9 @@ $.extend({
 
     // service-proxy or pazpar2
     pazpar2: function(config) {
+	var id_popup = config.id_popup || "#mkwsPopup";
+	id_popup = id_popup.replace(/^#/, "");
+
 	// simple layout
 	var div = '<div id="mkwsSwitch"></div>\
 	<div id="mkwsLang"></div>\
@@ -898,7 +903,7 @@ $.extend({
 
 	var popup = '\
 	  <div id="mkwsSearch"></div>\
-	  <div id="mkwsPopup">\
+	  <div id="' + id_popup + '">\
 	    <div id="mkwsSwitch"></div>\
 	    <div id="mkwsLang"></div>\
 	    <div id="mkwsResults"></div>\
@@ -910,7 +915,7 @@ $.extend({
 	    this.debug2("jquery plugin layout: div");
 	    document.write(div);
 	} else if (config && config.layout == 'popup') {
-	    this.debug2("jquery plugin layout: popup");
+	    this.debug2("jquery plugin layout: popup with id: " + id_popup);
 	    document.write(popup);
 	    $(document).ready( function() { init_popup(config); } );
 	} else {