call SP auth only for SP

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

diff --git a/experiments/spclient/mkws.js b/experiments/spclient/mkws.js
index 1ad3875..b966f1d 100644 (file)
--- a/experiments/spclient/mkws.js
+++ b/experiments/spclient/mkws.js
@@ -1,18 +1,26 @@
 /* A very simple client that shows a basic usage of the pz2.js
 */
 
+"use strict"; // HTML5
+
+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 pazpar2path = mkws_config.use_service_proxy ? service_proxy_url : pazpar2_url;
+var usesessions = mkws_config.use_service_proxy ? false : true;
+
 // create a parameters array and pass it to the pz2's constructor
 // then register the form submit event with the pz2.search function
 // autoInit is set to true on default
 var my_paz = new pz2( { "onshow": my_onshow,
                     "showtime": 500,            //each timer (show, stat, term, bytarget) can be specified this way
-                    "pazpar2path": '/service-proxy/',
+                    "pazpar2path": pazpar2path,
                     "oninit": my_oninit,
                     "onstat": my_onstat,
                     "onterm": my_onterm,
                     "termlist": "xtargets,subject,author",
                     "onbytarget": my_onbytarget,
-                   "usesessions" : false,
+                   "usesessions" : usesessions,
                     "showResponseType": '', // or "json" (for debugging?)
                     "onrecord": my_onrecord } );
 // some state vars
@@ -384,7 +392,7 @@ function mkws_html_all(data) {
        sort_default: "relevance",
        perpage_default: 20,
        query_width: 50,
-       mkws_switch: true, /* show/hide Records|Targets menu */
+       switch: true, /* show/hide Records|Targets menu */
 
        dummy: "dummy"
     };
@@ -394,8 +402,6 @@ function mkws_html_all(data) {
        config[k] = data[k];
     }
 
-    mkws_html_switch(config);
-
     // For some reason, doing this programmatically results in
     // document.search.query being undefined, hence the raw HTML.
     $("#mkwsSearch").html('\
@@ -426,11 +432,9 @@ function mkws_html_all(data) {
       </table>\
     </div>');
 
-    $("#mkwsTargets").html('\
-      <div id="bytarget">\
-       No information available yet.\
-      </div>');
-    $("#mkwsTargets").css("display", "none");
+    mkws_html_switch(config);
+    if (mkws_config.use_service_proxy)
+       mkws_service_proxy_auth(config.service_proxy_auth);
 
     domReady();
 }
@@ -448,7 +452,13 @@ function mkws_html_switch(config) {
        text: "Targets"
     }));
 
-    if (!config.mkws_switch) {
+    $("#mkwsTargets").html('\
+      <div id="bytarget">\
+       No information available yet.\
+      </div>');
+    $("#mkwsTargets").css("display", "none");
+
+    if (!config.switch) {
         $("#mkwsSwitch").css("display", "none");
     }
 }
@@ -497,7 +507,7 @@ function mkws_service_proxy_auth(auth_url) {
     if (!auth_url)
        auth_url = "/service-proxy-auth";
 
-    var jqxhr = jQuery.get(auth_url);
+    var jqxhr = jQuery.get(auth_url)
        .fail(function() {
            alert("service proxy authentication failed, give up!");
        })
@@ -514,5 +524,5 @@ function mkws_service_proxy_auth(auth_url) {
        });
 }
 
+/* magic */
 $(document).ready(function() { mkws_html_all(mkws_config) });
-$(document).ready(function() { mkws_service_proxy_auth(); });