Try to use pz2 API instead of jQuery for initial auth call.

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

diff --git a/experiments/spclient/mkws.js b/experiments/spclient/mkws.js
index 306efc0..ee5c17a 100644 (file)
--- a/experiments/spclient/mkws.js
+++ b/experiments/spclient/mkws.js
@@ -13,6 +13,9 @@
 if (!mkws_config)
     var mkws_config = {}; // for the guys who forgot to define mkws_config...
 
+if (typeof mkws_config.use_service_proxy === 'undefined')
+    mkws_config.use_service_proxy = true;
+
 var mkws_debug = 1;
 
 var pazpar2_url = mkws_config.pazpar2_url ? mkws_config.pazpar2_url : "/pazpar2/search.pz2";
@@ -616,21 +619,18 @@ function mkws_service_proxy_auth(auth_url) {
        
     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 */
@@ -646,13 +646,15 @@ function mkws_html_lang(mkws_config) {
        hash[lang_display[i]] = 1;
     }
     
-    if (hash[lang_default] == 1)
-       list.push(lang_default);
-
     for (var k in mkws_locale_lang) {
        if (hash[k] == 1 || lang_display.length == 0)
            list.push(k);
     }
+
+    // add english link
+    if (lang_display.length == 0 || hash[lang_default] == 1)
+        list.push(lang_default);
+
     debug("Language menu for: " + list.join(", "));
 
     /* the HTML part */
@@ -685,7 +687,7 @@ function M(word) {
 
 /* implement jQuery.parseQuerystring() for parsing URL parameters */
 jQuery.extend({
-    parseQuerystring: function() {
+  parseQuerystring: function() {
     var nvpair = {};
     var qs = window.location.search.replace('?', '');
     var pairs = qs.split('&');
@@ -694,7 +696,21 @@ jQuery.extend({
        nvpair[pair[0]] = pair[1];
     });
     return nvpair;
-} });
+  }, 
+  pazpar2: function(data) {
+       document.write('<div id="mkwsSwitch"></div>\
+    <div id="mkwsLang"></div>\
+    <div id="mkwsSearch"></div>\
+    <div id="mkwsRecords"></div>\
+    <div id="mkwsTargets"></div>\
+    <div id="footer">\
+      <div id="mkwsStat"></div>\
+      <span>Powered by MKWS &copy; 2013 <a href="http://www.indexdata.com">Index Data</a></span>\
+    </div>');
+
+    mkws_html_all(mkws_config);
+  }
+});
 
 function debug(string) {
     if (!mkws_debug)