X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=experiments%2Fspclient%2Fmkws.js;h=d823c4a84c48579e7642fce7a499c1113783b5fd;hb=ee0e1b54b167661151ec7cd8d914cdac70a0f937;hp=6067fb165c68530bab2fc6515f5368dcaafe1d33;hpb=587571a9298b2f3256f7352739e051f874f10048;p=mkws-moved-to-github.git

diff --git a/experiments/spclient/mkws.js b/experiments/spclient/mkws.js
index 6067fb1..d823c4a 100644
--- a/experiments/spclient/mkws.js
+++ b/experiments/spclient/mkws.js
@@ -72,7 +72,7 @@ function my_onshow(data) {
 }
 
 function my_onstat(data) {
-    var stat = document.getElementById("stat");
+    var stat = document.getElementById("mkwsStat");
     if (stat == null)
 	return;
 
@@ -371,17 +371,44 @@ function renderDetails(data, marker)
     return details;
 }
 
+/*
+ * All the HTML stuff to render the search forms and
+ * result pages.
+ */
+function mkws_html_all(data) {
+
+    var config = {
+	sort: [ ["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]],
+	perpage: [10, 20, 30, 50],
+	sort_default: "relevance",
+	perpage_default: 20,
+	query_width: 50,
+	mkws_switch: true, /* show/hide Records|Targets menu */
+
+	dummy: "dummy"
+    };
+
+    /* override standard config values by function parameters */
+    for (var k in data) {
+	config[k] = data[k];
+    }
+
 
-$(document).ready(function() {
-    $("#mkwsSwitch").html($("<a/>", { href: '#',
-				      onclick: "switchView(\'records\')",
-				      text: "Record Browser",
-				    }));
+    $("#mkwsSwitch").html($("<a/>", {
+	href: '#',
+	onclick: "switchView(\'records\')",
+	text: "Records",
+    }));
     $("#mkwsSwitch").append($("<span/>", { text: " | " }));
-    $("#mkwsSwitch").append($("<a/>", { href: '#',
-					onclick: "switchView(\'targets\')",
-					text: "Target Info",
-				      }));
+    $("#mkwsSwitch").append($("<a/>", {
+	href: '#',
+	onclick: "switchView(\'targets\')",
+	text: "Targets",
+    }));
+
+    if (!config.mkws_switch) {
+        $("#mkwsSwitch").css("display", "none");
+    }
 
     // For some reason, doing this programmatically results in
     // document.search.query being undefined, hence the raw HTML.
@@ -422,8 +449,31 @@ $(document).ready(function() {
     $("#mkwsTargets").css("display", "none");
 
     domReady();
+}
 
+/* 
+ * Run service-proxy authentication in background (after page load).
+ * The username/password is configured in the apache config file
+ * for the site.
+ */
+function mkws_service_proxy_auth() {
     var jqxhr = jQuery.get("/service-proxy-auth")
-	.fail(function() { alert("service proxy authentifiction failed"); });
+	.fail(function() {
+	    alert("service proxy authentication failed, give up!");
+	})
+	.success(function(data) {
+	    if (!jQuery.isXMLDoc(data)) {
+		alert("service proxy auth response document is not valid XML document, give up!");
+		return;
+	    }
+	    var status = $(data).find("status");
+	    if (status.text() != "OK") {
+		alert("service proxy auth repsonse status: " + status.text() + ", give up!");
+		return;
+	    }
+	});
+}
+
+/* moved to index.html:  $(document).ready(function() { mkws_html_all( { mkws_switch: false }); }); */
+$(document).ready(function() { mkws_service_proxy_auth(); });
 
-});