X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=71daa5208ce6c8219b268a2431ba9eec15d34632;hb=e87e41ac4d90e6a4dcd979676b11dd9d04c98c27;hp=c928f9c872e9b5a5b76c8b2835ea7c366f7aecd7;hpb=625eb2222159cf2c5144e9df0e2277e9d4edb1cd;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index c928f9c..71daa52 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,23 +19,16 @@
  * including this JS file
  */
 
-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;
 
-// global debug flag
-var mkws_debug;
-
 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;
+mkws.pazpar2path = mkws_config.use_service_proxy ? service_proxy_url : pazpar2_url;
+mkws.usesessions = mkws_config.use_service_proxy ? false : true;
 
-
-var mkws_locale_lang = {
+mkws.locale_lang = {
     "de": {
 	"Authors": "Autoren",
 	"Subjects": "Schlagwörter",
@@ -47,6 +49,7 @@ var mkws_locale_lang = {
 	"Date": "Datum",
 	"Subject": "Schlagwort",
 	"Location": "Ort",
+	// ### to add: Records, Targets
 
 	"dummy": "dummy"
     },
@@ -71,18 +74,45 @@ var mkws_locale_lang = {
 	"Date": "Dato",
 	"Subject": "Emneord",
 	"Location": "Lokation",
+	// ### to add: Records, Targets
 
 	"dummy": "dummy"
     }
 };
 
+// keep time state for debugging
+mkws.debug_time = {
+    "start": $.now(),
+    "last": $.now()
+};
+mkws.debug = function (string) {
+    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(timestamp + arguments.callee.caller);
+    } else if (mkws.debug >= 2) {
+	console.log(timestamp + ">>> called from function " + arguments.callee.caller.name + ' <<<');
+    }
+    console.log(timestamp + string);
+}
+var debug = mkws.debug; // local alias
 
 for (var key in mkws_config) {
     if (mkws_config.hasOwnProperty(key)) {
 	if (key.match(/^language_/)) {
 	    var lang = key.replace(/^language_/, "");
 	    // Copy custom languages into list
-	    mkws_locale_lang[lang] = mkws_config[key];
+	    mkws.locale_lang[lang] = mkws_config[key];
 	}
     }
 }
@@ -93,15 +123,18 @@ 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 } );
+
+mkws.my_paz = my_paz; // export
+
 // some state vars
 var curPage = 1;
 var recPerPage = 20;
@@ -142,7 +175,7 @@ function my_onshow(data) {
 	      html.push('<div class="record" id="mkwsRecdiv_'+hit.recid+'" >'
             +'<span>'+ (i + 1 + recPerPage * (curPage - 1)) +'. </span>'
             +'<a href="#" id="mkwsRec_'+hit.recid
-            +'" onclick="showDetails(this.id);return false;"><b>'
+            +'" onclick="mkws.showDetails(this.id);return false;"><b>'
             + hit["md-title"] +' </b></a>');
 	      if (hit["md-title-remainder"] !== undefined) {
 	        html.push('<span>' + hit["md-title-remainder"] + ' </span>');
@@ -201,20 +234,22 @@ function my_onterm(data) {
 }
 
 function add_single_facet(acc, caption, data, max, cclIndex) {
-    acc.push('<div class="facet">');
+    acc.push('<div class="facet" id="mkwsFacet' + caption + '">');
     acc.push('<div class="termtitle">' + M(caption) + '</div>');
     for (var i = 0; i < data.length && i < max; i++ ) {
+	acc.push('<div class="term">');
         acc.push('<a href="#" ');
 	var action;
 	if (!cclIndex) {
 	    // Special case: target selection
 	    acc.push('target_id='+data[i].id+' ');
-	    action = 'limitTarget(this.getAttribute(\'target_id\'),this.firstChild.nodeValue)';
+	    action = 'mkws.limitTarget(this.getAttribute(\'target_id\'),this.firstChild.nodeValue)';
 	} else {
-	    action = 'limitQuery(\'' + cclIndex + '\', this.firstChild.nodeValue)';
+	    action = 'mkws.limitQuery(\'' + cclIndex + '\', this.firstChild.nodeValue)';
 	}
 	acc.push('onclick="' + action + ';return false;">' + data[i].name + '</a>'
-		 + '<span> (' + data[i].freq + ')</span><br/>');
+		 + ' <span>' + data[i].freq + '</span>');
+	acc.push('</div>');
     }
     acc.push('</div>');
 }
@@ -233,6 +268,11 @@ function my_onrecord(data) {
 
 function my_onbytarget(data) {
     var targetDiv = document.getElementById("mkwsBytarget");
+    if (!targetDiv) {
+	// No mkwsTargets div.
+	return;
+    }
+
     var table ='<table><thead><tr><td>Target ID</td><td>Hits</td><td>Diags</td>'
         +'<td>Records</td><td>State</td></tr></thead><tbody>';
 
@@ -270,7 +310,7 @@ function onFormSubmitEventHandler()
     resetPage();
     loadSelect();
     triggerSearch();
-    switchView('records'); // In case it's configured to start off as hidden
+    mkws.switchView('records'); // In case it's configured to start off as hidden
     submitted = true;
     return false;
 }
@@ -306,18 +346,18 @@ function loadSelect ()
 }
 
 // limit the query after clicking the facet
-function limitQuery (field, value)
+mkws.limitQuery = function (field, value)
 {
-    document.mkwsSearchForm.query.value += ' and ' + field + '="' + value + '"';
+    document.mkwsSearchForm.mkwsQuery.value += ' and ' + field + '="' + value + '"';
     onFormSubmitEventHandler();
 }
 
 // limit by target functions
-function limitTarget (id, name)
+mkws.limitTarget  = function (id, name)
 {
     var navi = document.getElementById('mkwsNavi');
     navi.innerHTML =
-        'Source: <a class="crossout" href="#" onclick="delimitTarget();return false;">'
+        'Source: <a class="crossout" href="#" onclick="mkws.delimitTarget();return false;">'
         + name + '</a>';
     curFilter = 'pz:id=' + id;
     resetPage();
@@ -326,7 +366,7 @@ function limitTarget (id, name)
     return false;
 }
 
-function delimitTarget ()
+mkws.delimitTarget = function ()
 {
     var navi = document.getElementById('mkwsNavi');
     navi.innerHTML = '';
@@ -353,7 +393,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 = '';
@@ -362,13 +402,13 @@ function drawPager (pagerDiv)
         if(i == curPage)
             numLabel = '<b>' + i + '</b>';
 
-        middle += '<a href="#" onclick="showPage(' + i + ')"> '
+        middle += '<a href="#" onclick="mkws.showPage(' + i + ')"> '
             + numLabel + ' </a>';
     }
 
     var next = '<b> | </b><span id="mkwsNext">' + M('Next') + ' &#62;&#62;</span>';
     if (pages - curPage > 0)
-        next = '<b> | </b><a href="#" id="mkwsNext" onclick="pagerNext()">'
+        next = '<b> | </b><a href="#" id="mkwsNext" onclick="mkws.pagerNext()">'
         + M('Next') + ' &#62;&#62;</a>';
 
     var predots = '';
@@ -383,7 +423,7 @@ function drawPager (pagerDiv)
         + prev + predots + middle + postdots + next + '</div>';
 }
 
-function showPage (pageNum)
+mkws.showPage = function (pageNum)
 {
     curPage = pageNum;
     my_paz.showPage( curPage - 1 );
@@ -391,21 +431,23 @@ function showPage (pageNum)
 
 // simple paging functions
 
-function pagerNext() {
+mkws.pagerNext = function () {
     if ( totalRec - recPerPage*curPage > 0) {
         my_paz.showNext();
         curPage++;
     }
 }
 
-function pagerPrev() {
+mkws.pagerPrev = function () {
     if ( my_paz.showPrev() != false )
         curPage--;
 }
 
 // switching view between targets and records
 
-function switchView(view) {
+mkws.switchView = function(view) {
+    debug("switchView: " + view);
+
     var targets = document.getElementById('mkwsTargets');
     var results = document.getElementById('mkwsResults') ||
 	          document.getElementById('mkwsRecords');
@@ -437,7 +479,7 @@ function switchView(view) {
 }
 
 // detailed record drawing
-function showDetails (prefixRecId) {
+mkws.showDetails = function (prefixRecId) {
     var recId = prefixRecId.replace('mkwsRec_', '');
     var oldRecId = curDetRecId;
     curDetRecId = recId;
@@ -516,17 +558,20 @@ function renderField(caption, data, data2, data3) {
 function mkws_html_all(config) {
 
     /* default mkws config */
+    /* ### No defaults given for:
+     * lang, responsive_design, service_proxy_auth, use_service_proxy
+     * and of course the optional language_* entries.
+     */
     var mkws_config_default = {
-	sort: [["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]],
-	perpage: [10, 20, 30, 50],
+	sort_options: [["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]],
+	perpage_options: [10, 20, 30, 50],
 	sort_default: "relevance",
 	perpage_default: 20,
 	query_width: 50,
-	switch_menu: false, 	/* show/hide Records|Targets menu */
-	lang_menu: true, 	/* show/hide language menu */
-	sort_menu: true, 	/* show/hide sort menu */
-	perpage_menu: true, 	/* show/hide perpage menu */
-	lang_display: [], 	/* display languages links for given languages, [] for all */
+	show_lang: true, 	/* show/hide language menu */
+	show_sort: true, 	/* show/hide sort menu */
+	show_perpage: true, 	/* show/hide perpage menu */
+	lang_options: [], 	/* display languages links for given languages, [] for all */
 	facets: ["sources", "subjects", "authors"], /* display facets, in this order, [] for none */
 	responsive_design_width: 980, /* a page with less pixel width considered as narrow */
 	debug: 1,     /* debug level for development: 0..2 */
@@ -536,9 +581,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 */
@@ -554,7 +599,7 @@ function mkws_html_all(config) {
     }
 
     mkws_set_lang(mkws_config);
-    if (mkws_config.lang_menu)
+    if (mkws_config.show_lang)
 	mkws_html_lang(mkws_config);
 
     // For some reason, doing this programmatically results in
@@ -600,10 +645,10 @@ function mkws_html_all(config) {
     if ($("#mkwsRanking").length) {
 	var ranking_data = '';
 	ranking_data += '<form name="mkwsSelect" id="mkwsSelect" action="" >';
-	if (config.sort_menu) {
+	if (config.show_sort) {
 	    ranking_data +=  M('Sort by') + ' ' + mkws_html_sort(config) + ' ';
 	}
-	if (config.perpage_menu) {
+	if (config.show_perpage) {
 	    ranking_data += M('and show') + ' ' + mkws_html_perpage(config) + ' ' + M('per page') + '.';
 	}
         ranking_data += '</form>';
@@ -638,8 +683,8 @@ function mkws_html_all(config) {
 }
 
 function mkws_set_lang(mkws_config)  {
-    var lang = jQuery.parseQuerystring().lang || mkws_config.lang || "";
-    if (!lang || !mkws_locale_lang[lang]) {
+    var lang = $.parseQuerystring().lang || mkws_config.lang || "";
+    if (!lang || !mkws.locale_lang[lang]) {
 	mkws_config.lang = ""
     } else {
 	mkws_config.lang = lang;
@@ -652,17 +697,9 @@ function mkws_set_lang(mkws_config)  {
 function mkws_html_switch(config) {
     debug("HTML switch");
 
-    $("#mkwsSwitch").html($("<a/>", {
-	href: '#',
-	onclick: "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: "switchView(\'targets\')",
-	text: M("Targets")
-    }));
+    $("#mkwsSwitch").append($('<a href="#" id="mkwsSwitch_targets" onclick="mkws.switchView(\'targets\')">' + M('Targets') + '</a>'));
 
     debug("HTML targets");
     $("#mkwsTargets").html('\
@@ -670,20 +707,15 @@ function mkws_html_switch(config) {
        No information available yet.\
       </div>');
     $("#mkwsTargets").css("display", "none");
-
-    if (!config.switch_menu) {
-	debug("disable switch menu");
-        $("#mkwsSwitch").css("display", "none");
-    }
 }
 
 function mkws_html_sort(config) {
     debug("HTML sort");
     var sort_html = '<select name="mkwsSort" id="mkwsSort">';
 
-    for(var i = 0; i < config.sort.length; i++) {
-	var key = config.sort[i][0];
-	var val = config.sort[i].length == 1 ? config.sort[i][0] : config.sort[i][1];
+    for(var i = 0; i < config.sort_options.length; i++) {
+	var key = config.sort_options[i][0];
+	var val = config.sort_options[i].length == 1 ? config.sort_options[i][0] : config.sort_options[i][1];
 
 	sort_html += '<option value="' + key + '"';
 	if (key == config.sort_default) {
@@ -700,8 +732,8 @@ function mkws_html_perpage(config) {
     debug("HTML perpage");
     var perpage_html = '<select name="mkwsPerpage" id="mkwsPerpage">';
 
-    for(var i = 0; i < config.perpage.length; i++) {
-	var key = config.perpage[i];
+    for(var i = 0; i < config.perpage_options.length; i++) {
+	var key = config.perpage_options[i];
 
 	perpage_html += '<option value="' + key + '"';
 	if (key == config.perpage_default) {
@@ -725,9 +757,13 @@ function mkws_service_proxy_auth(auth_url) {
 
     debug("Run service proxy auth URL: " + auth_url);
 
-    var request = new pzHttpRequest(auth_url);
+    var request = new pzHttpRequest(auth_url, function(err) {
+	alert("HTTP call for authentication failed: " + err)
+	return;
+    });
+
     request.get(null, function(data) {
-	if (!jQuery.isXMLDoc(data)) {
+	if (!$.isXMLDoc(data)) {
 	    alert("service proxy auth response document is not valid XML document, give up!");
 	    return;
 	}
@@ -736,6 +772,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;
     });
 }
 
@@ -746,19 +785,19 @@ function mkws_html_lang(mkws_config) {
     var list = [];
 
     /* display a list of configured languages, or all */
-    var lang_display = mkws_config.lang_display || [];
+    var lang_options = mkws_config.lang_options || [];
     var hash = {};
-    for (var i = 0; i < lang_display.length; i++) {
-	hash[lang_display[i]] = 1;
+    for (var i = 0; i < lang_options.length; i++) {
+	hash[lang_options[i]] = 1;
     }
 
-    for (var k in mkws_locale_lang) {
-	if (hash[k] == 1 || lang_display.length == 0)
+    for (var k in mkws.locale_lang) {
+	if (hash[k] == 1 || lang_options.length == 0)
 	    list.push(k);
     }
 
     // add english link
-    if (lang_display.length == 0 || hash[lang_default] == 1)
+    if (lang_options.length == 0 || hash[lang_default] == 1)
         list.push(lang_default);
 
     debug("Language menu for: " + list.join(", "));
@@ -812,17 +851,17 @@ function mkws_resize_page () {
 function M(word) {
     var lang = mkws_config.lang;
 
-    if (!lang || !mkws_locale_lang[lang])
+    if (!lang || !mkws.locale_lang[lang])
 	return word;
 
-    return mkws_locale_lang[lang][word] ? mkws_locale_lang[lang][word] : word;
+    return mkws.locale_lang[lang][word] ? mkws.locale_lang[lang][word] : word;
 }
 
 /*
  * implement jQuery plugins
  */
-jQuery.extend({
-    // implement jQuery.parseQuerystring() for parsing URL parameters
+$.extend({
+    // implement $.parseQuerystring() for parsing URL parameters
     parseQuerystring: function() {
 	var nvpair = {};
 	var qs = window.location.search.replace('?', '');
@@ -840,6 +879,9 @@ jQuery.extend({
 
     // service-proxy or pazpar2
     pazpar2: function(config) {
+	var id_popup = config.id_popup || "#mkwsPopup";
+	id_popup = id_popup.replace(/^#/, "");
+
 	// simple layout
 	var div = '<div id="mkwsSwitch"></div>\
 	<div id="mkwsLang"></div>\
@@ -896,7 +938,7 @@ jQuery.extend({
 
 	var popup = '\
 	  <div id="mkwsSearch"></div>\
-	  <div id="mkwsPopup">\
+	  <div id="' + id_popup + '">\
 	    <div id="mkwsSwitch"></div>\
 	    <div id="mkwsLang"></div>\
 	    <div id="mkwsResults"></div>\
@@ -908,7 +950,7 @@ jQuery.extend({
 	    this.debug2("jquery plugin layout: div");
 	    document.write(div);
 	} else if (config && config.layout == 'popup') {
-	    this.debug2("jquery plugin layout: popup");
+	    this.debug2("jquery plugin layout: popup with id: " + id_popup);
 	    document.write(popup);
 	    $(document).ready( function() { init_popup(config); } );
 	} else {
@@ -919,15 +961,22 @@ jQuery.extend({
 });
 
 function init_popup(obj) {
-    var config = obj && obj.config ? obj.config : {};
+    var config = obj ? obj : {};
 
     var height = config.height || 760;
     var width = config.width || 880;
-    var id_button = config.button || "input#mkwsButton";
-    var id_popup = config.popup || "#mkwsPopup";
+    var id_button = config.id_button || "input#mkwsButton";
+    var id_popup = config.id_popup || "#mkwsPopup";
 
     debug("popup height: " + height + ", width: " + width);
 
+    // make sure that jquery-ui was loaded afte jQuery core lib, e.g.:
+    // <script src="http://code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
+    if (!$.ui) {
+	debug("Error: jquery-ui.js is missing, did you included it after jquery core in the HTML file?");
+	return;
+    }
+
     $(id_popup).dialog({
       closeOnEscape: true,
       autoOpen: false,
@@ -950,23 +999,19 @@ function init_popup(obj) {
       });
 };
 
-function debug(string) {
-    if (!mkws_debug)
-	return;
 
-    if (typeof console === "undefined" || typeof console.log === "undefined") { /* ARGH!!! old IE */
-	return;
-    }
 
-    // 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 + ' <<<');
+
+/* magic */
+$(document).ready(function() {
+    try {
+	mkws_html_all(mkws_config)
     }
-    console.log(string);
-}
 
+    catch (e) {
+	mkws_config.error = e.message;
+	// alert(e.message);
+    }
+});
 
-/* magic */
-$(document).ready(function() { mkws_html_all(mkws_config) });
+})(jQuery);