X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=144d2de477c896580095d8fafead11c8fa481a69;hb=9c7195162561ca11d57775a6fd5ef42f82cde3f4;hp=3ae8ae0491c0cbbe87470aba5e6d76490cb05d61;hpb=c5d1ba8a251f55565705b4864da7b24bcf8cf307;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 3ae8ae0..144d2de 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -3,6 +3,15 @@
 
 "use strict"; // HTML5: disable for debug >= 2
 
+// Set up namespace and some state.
+var mkws = {};
+
+if (!mkws_config)
+    var mkws_config = {}; // for the guys who forgot to define mkws_config...
+
+// Wrapper for jQuery
+(function ($) {
+
 /*
  * global config object: mkws_config
  *
@@ -10,28 +19,14 @@
  * including this JS file
  */
 
-if (!mkws_config)
-    var mkws_config = {}; // for the guys who forgot to define mkws_config...
-
-// Set up namespace and some state.
-var mkws = {};
-
-
 if (typeof mkws_config.use_service_proxy === 'undefined')
     mkws_config.use_service_proxy = true;
 
-
 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 : "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;
-
-var mkws_debug;
-
-
-// Wrapper for jQuery
-(function ($) {
+mkws.pazpar2path = mkws_config.use_service_proxy ? service_proxy_url : pazpar2_url;
+mkws.usesessions = mkws_config.use_service_proxy ? false : true;
 
 mkws.locale_lang = {
     "de": {
@@ -84,7 +79,7 @@ mkws.locale_lang = {
 };
 
 mkws.debug = function (string) {
-    if (!mkws_debug)
+    if (!mkws.debug)
 	return;
 
     if (typeof console === "undefined" || typeof console.log === "undefined") { /* ARGH!!! old IE */
@@ -92,9 +87,9 @@ mkws.debug = function (string) {
     }
 
     // you need to disable use strict at the top of the file!!!
-    if (mkws_debug >= 3) {
+    if (mkws.debug >= 3) {
 	console.log(arguments.callee.caller);
-    } else if (mkws_debug >= 2) {
+    } else if (mkws.debug >= 2) {
 	console.log(">>> called from function " + arguments.callee.caller.name + ' <<<');
     }
     console.log(string);
@@ -117,13 +112,13 @@ for (var key in mkws_config) {
 // 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": pazpar2path,
+                    "pazpar2path": mkws.pazpar2path,
                     "oninit": my_oninit,
                     "onstat": my_onstat,
                     "onterm": my_onterm,
                     "termlist": "xtargets,subject,author",
                     "onbytarget": my_onbytarget,
-	 	    "usesessions" : usesessions,
+	 	    "usesessions" : mkws.usesessions,
                     "showResponseType": '', // or "json" (for debugging?)
                     "onrecord": my_onrecord } );
 
@@ -569,9 +564,9 @@ function mkws_html_all(config) {
 
     /* set global debug flag early */
     if (typeof config.debug !== 'undefined') {
-	mkws_debug = config.debug;
+	mkws.debug = config.debug;
     } else if (typeof mkws_config_default.debug !== 'undefined') {
-	mkws_debug = mkws_config_default.debug;
+	mkws.debug = mkws_config_default.debug;
     }
 
     /* override standard config values by function parameters */
@@ -757,6 +752,7 @@ function mkws_service_proxy_auth(auth_url) {
 	alert("HTTP call for authentication failed: " + err)
 	return;
     });
+
     request.get(null, function(data) {
 	if (!$.isXMLDoc(data)) {
 	    alert("service proxy auth response document is not valid XML document, give up!");
@@ -767,6 +763,9 @@ function mkws_service_proxy_auth(auth_url) {
 	    alert("service proxy auth repsonse status: " + status.text() + ", give up!");
 	    return;
 	}
+
+	debug("Service proxy auth successfully done");
+	mkws.service_proxy_auth = true;
     });
 }