Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws

[mkws-moved-to-github.git] / tools / htdocs / mkws.js

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 3ae8ae0..51de2f9 100644 (file)
--- 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": {
@@ -83,21 +78,30 @@ mkws.locale_lang = {
     }
 };
 
+// keep time state for debugging
+mkws.debug_time = {
+    "start": $.now(),
+    "last": $.now()
+};
 mkws.debug = function (string) {
-    if (!mkws_debug)
+    if (!mkws.debug)
        return;
 
     if (typeof console === "undefined" || typeof console.log === "undefined") { /* ARGH!!! old IE */
        return;
     }
 
+    var now = $.now();
+    var timestamp = (now - mkws.debug_time.start)/1000 + " (+" + (now - mkws.debug_time.last)/1000 + ") "
+    mkws.debug_time.last = now;
+
     // you need to disable use strict at the top of the file!!!
-    if (mkws_debug >= 3) {
-       console.log(arguments.callee.caller);
-    } else if (mkws_debug >= 2) {
-       console.log(">>> called from function " + arguments.callee.caller.name + ' <<<');
+    if (mkws.debug >= 3) {
+       console.log(timestamp + arguments.callee.caller);
+    } else if (mkws.debug >= 2) {
+       console.log(timestamp + ">>> called from function " + arguments.callee.caller.name + ' <<<');
     }
-    console.log(string);
+    console.log(timestamp + string);
 }
 var debug = mkws.debug; // local alias
 
@@ -117,13 +121,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 } );
 
@@ -387,7 +391,7 @@ function drawPager (pagerDiv)
 
     var prev = '<span id="mkwsPrev">&#60;&#60; ' + M('Prev') + '</span><b> | </b>';
     if (curPage > 1)
-        prev = '<a href="#" id="mkwsPrev" onclick="pagerPrev();">'
+        prev = '<a href="#" id="mkwsPrev" onclick="mkws.pagerPrev();">'
         +'&#60;&#60; ' + M('Prev') + '</a><b> | </b>';
 
     var middle = '';
@@ -432,7 +436,7 @@ mkws.pagerNext = function () {
     }
 }
 
-function pagerPrev() {
+mkws.pagerPrev = function () {
     if ( my_paz.showPrev() != false )
         curPage--;
 }
@@ -440,6 +444,8 @@ function pagerPrev() {
 // switching view between targets and records
 
 mkws.switchView = function(view) {
+    debug("switchView: " + view);
+
     var targets = document.getElementById('mkwsTargets');
     var results = document.getElementById('mkwsResults') ||
                  document.getElementById('mkwsRecords');
@@ -569,9 +575,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 */
@@ -685,17 +691,9 @@ function mkws_set_lang(mkws_config)  {
 function mkws_html_switch(config) {
     debug("HTML switch");
 
-    $("#mkwsSwitch").html($("<a/>", {
-       href: '#',
-       onclick: "mkws.switchView(\'records\')",
-       text: M("Records")
-    }));
+    $("#mkwsSwitch").append($('<a href="#" id="mkwsSwitch_records" onclick="mkws.switchView(\'records\')">' + M("Records") + '</a>'));
     $("#mkwsSwitch").append($("<span/>", { text: " | " }));
-    $("#mkwsSwitch").append($("<a/>", {
-       href: '#',
-       onclick: "mkws.switchView(\'targets\')",
-       text: M("Targets")
-    }));
+    $("#mkwsSwitch").append($('<a href="#" id="mkwsSwitch_targets" onclick="mkws.switchView(\'targets\')">' + M("Targets") + '</a>'));
 
     debug("HTML targets");
     $("#mkwsTargets").html('\
@@ -757,6 +755,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 +766,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;
     });
 }