switchView() supports argument 'none'

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

diff --git a/experiments/spclient/mkws.js b/experiments/spclient/mkws.js
index e3e5fe5..8b00688 100644 (file)
--- a/experiments/spclient/mkws.js
+++ b/experiments/spclient/mkws.js
@@ -19,7 +19,7 @@ if (typeof mkws_config.use_service_proxy === 'undefined')
 var mkws_debug = 1;
 
 var pazpar2_url = mkws_config.pazpar2_url ? mkws_config.pazpar2_url : "/pazpar2/search.pz2";
-var service_proxy_url = mkws_config.service_proxy_url ? mkws_config.service_proxy_url : "/service-proxy/";
+var service_proxy_url = mkws_config.service_proxy_url ? mkws_config.service_proxy_url : "http://mkws.indexdata.com/service-proxy/";
 
 var pazpar2path = mkws_config.use_service_proxy ? service_proxy_url : pazpar2_url;
 var usesessions = mkws_config.use_service_proxy ? false : true;
@@ -234,6 +234,7 @@ function onFormSubmitEventHandler()
     resetPage();
     loadSelect();
     triggerSearch();
+    switchView('records'); // In case it's configured to start off as hidden
     submitted = true;
     return false;
 }
@@ -369,15 +370,23 @@ function switchView(view) {
 
     var targets = document.getElementById('mkwsTargets');
     var records = document.getElementById('mkwsRecords');
+    var blanket = document.getElementById('mkwsBlanket');
 
     switch(view) {
         case 'targets':
             targets.style.display = "block";
             records.style.display = "none";
+            if (blanket) { blanket.style.display = "none"; }
             break;
         case 'records':
             targets.style.display = "none";
             records.style.display = "block";
+            if (blanket) { blanket.style.display = "block"; }
+            break;
+       case 'none':
+            targets.style.display = "none";
+            records.style.display = "none";
+            if (blanket) { blanket.style.display = "none"; }
             break;
         default:
             alert('Unknown view.');
@@ -615,25 +624,22 @@ function mkws_html_perpage(config) {
  */
 function mkws_service_proxy_auth(auth_url) {
     if (!auth_url)
-       auth_url = "/service-proxy-auth";
+       auth_url = "http://mkws.indexdata.com/service-proxy-auth";
        
     debug("Run service proxy auth URL: " + auth_url);
 
-    var jqxhr = jQuery.get(auth_url)
-       .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;
-           }
-       });
+    var request = new pzHttpRequest(auth_url);
+    request.get(null, 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;
+       }
+    });
 }
 
 /* create locale language menu */