refactor mkws_html_all()

[mkws-moved-to-github.git] / experiments / spclient / mkws.js

diff --git a/experiments/spclient/mkws.js b/experiments/spclient/mkws.js
index 72531f3..fa551a7 100644 (file)
--- a/experiments/spclient/mkws.js
+++ b/experiments/spclient/mkws.js
@@ -371,17 +371,18 @@ function renderDetails(data, marker)
     return details;
 }
 
-
-$(document).ready(function() {
-    $("#mkwsSwitch").html($("<a/>", { href: '#',
-                                     onclick: "switchView(\'records\')",
-                                     text: "Record Browser",
-                                   }));
+function mkws_html_all() {
+    $("#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",
+    }));
 
     // For some reason, doing this programmatically results in
     // document.search.query being undefined, hence the raw HTML.
@@ -422,8 +423,27 @@ $(document).ready(function() {
     $("#mkwsTargets").css("display", "none");
 
     domReady();
+}
+
 
+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;
+           }
+       });
+}
+
+$(document).ready(function() { mkws_html_all(); });
+$(document).ready(function() { mkws_service_proxy_auth(); });
 
-});