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

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 71daa52..7c683f5 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -1,33 +1,26 @@
 /* A very simple client that shows a basic usage of the pz2.js
 */
 
-"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...
+"use strict"; // HTML5: disable for debug_level >= 2
 
 // Wrapper for jQuery
 (function ($) {
 
+// Set up namespace and some state.
+var mkws = {};
+
 /*
  * global config object: mkws_config
  *
- * needs to be defined in the HTML header before
- * including this JS file
+ * Needs to be defined in the HTML header before including this JS file.
+ * Define empty mkws_config for simple applications that don't define it.
  */
+if (!mkws_config)
+    var mkws_config = {};
 
 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/";
-
-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": {
 	"Authors": "Autoren",
@@ -85,8 +78,9 @@ mkws.debug_time = {
     "start": $.now(),
     "last": $.now()
 };
-mkws.debug = function (string) {
-    if (!mkws.debug)
+
+mkws.debug_function = function (string) {
+    if (!mkws.debug_level)
 	return;
 
     if (typeof console === "undefined" || typeof console.log === "undefined") { /* ARGH!!! old IE */
@@ -98,14 +92,55 @@ mkws.debug = function (string) {
     mkws.debug_time.last = now;
 
     // you need to disable use strict at the top of the file!!!
-    if (mkws.debug >= 3) {
+    if (mkws.debug_level >= 3) {
 	console.log(timestamp + arguments.callee.caller);
-    } else if (mkws.debug >= 2) {
+    } else if (mkws.debug_level >= 2) {
 	console.log(timestamp + ">>> called from function " + arguments.callee.caller.name + ' <<<');
     }
     console.log(timestamp + string);
 }
-var debug = mkws.debug; // local alias
+var debug = mkws.debug_function; // local alias
+
+/* default mkws config */
+/* ### No defaults given for:
+ * lang, service_proxy_auth, use_service_proxy
+ * and of course the optional language_* entries.
+ */
+var config_default = {
+    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,
+    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: undefined, /* a page with less pixel width considered as narrow */
+    debug_level: 1,     /* debug level for development: 0..2 */
+
+    dummy: "dummy"
+};
+
+/* set global debug_level flag early */
+if (typeof mkws_config.debug_level !== 'undefined') {
+    mkws.debug_level = mkws_config.debug_level;
+} else if (typeof config_default.debug_level !== 'undefined') {
+    mkws.debug_level = config_default.debug_level;
+}
+
+/* override standard config values by function parameters */
+for (var k in config_default) {
+    if (typeof mkws_config[k] === 'undefined')
+       mkws_config[k] = config_default[k];
+    debug("Set config: " + k + ' => ' + mkws_config[k]);
+}
+
+if (mkws_config.query_width < 5 || mkws_config.query_width > 150) {
+    debug("Reset query width: " + mkws_config.query_width);
+    mkws_config.query_width = 50;
+}
 
 for (var key in mkws_config) {
     if (mkws_config.hasOwnProperty(key)) {
@@ -123,13 +158,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": mkws.pazpar2path,
+                    "pazpar2path": mkws_config.pazpar2_url || "http://mkws.indexdata.com/service-proxy/",
                     "oninit": my_oninit,
                     "onstat": my_onstat,
                     "onterm": my_onterm,
                     "termlist": "xtargets,subject,author",
                     "onbytarget": my_onbytarget,
-	 	    "usesessions" : mkws.usesessions,
+	 	    "usesessions" : mkws_config.use_service_proxy ? false : true,
                     "showResponseType": '', // or "json" (for debugging?)
                     "onrecord": my_onrecord } );
 
@@ -173,7 +208,6 @@ function my_onshow(data) {
     for (var i = 0; i < data.hits.length; i++) {
         var hit = data.hits[i];
 	      html.push('<div class="record" id="mkwsRecdiv_'+hit.recid+'" >'
-            +'<span>'+ (i + 1 + recPerPage * (curPage - 1)) +'. </span>'
             +'<a href="#" id="mkwsRec_'+hit.recid
             +'" onclick="mkws.showDetails(this.id);return false;"><b>'
             + hit["md-title"] +' </b></a>');
@@ -555,52 +589,10 @@ function renderField(caption, data, data2, data3) {
  * All the HTML stuff to render the search forms and
  * result pages.
  */
-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_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,
-	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 */
-
-	dummy: "dummy"
-    };
-
-    /* set global debug flag early */
-    if (typeof config.debug !== 'undefined') {
-	mkws.debug = config.debug;
-    } else if (typeof mkws_config_default.debug !== 'undefined') {
-	mkws.debug = mkws_config_default.debug;
-    }
-
-    /* override standard config values by function parameters */
-    for (var k in mkws_config_default) {
-	if (typeof config[k] === 'undefined')
-	   mkws_config[k] = mkws_config_default[k];
-	debug("Set config: " + k + ' => ' + mkws_config[k]);
-    }
-
-    if (mkws_config.query_width < 5 || mkws_config.query_width > 150) {
-	debug("Reset query width: " + mkws_config.query_width);
-	mkws_config.query_width = 50;
-    }
-
-    mkws_set_lang(mkws_config);
+function mkws_html_all() {
+    mkws_set_lang();
     if (mkws_config.show_lang)
-	mkws_html_lang(mkws_config);
+	mkws_html_lang();
 
     // For some reason, doing this programmatically results in
     // document.mkwsSearchForm.mkwsQuery being undefined, hence the raw HTML.
@@ -645,23 +637,23 @@ function mkws_html_all(config) {
     if ($("#mkwsRanking").length) {
 	var ranking_data = '';
 	ranking_data += '<form name="mkwsSelect" id="mkwsSelect" action="" >';
-	if (config.show_sort) {
-	    ranking_data +=  M('Sort by') + ' ' + mkws_html_sort(config) + ' ';
+	if (mkws_config.show_sort) {
+	    ranking_data +=  M('Sort by') + ' ' + mkws_html_sort() + ' ';
 	}
-	if (config.show_perpage) {
-	    ranking_data += M('and show') + ' ' + mkws_html_perpage(config) + ' ' + M('per page') + '.';
+	if (mkws_config.show_perpage) {
+	    ranking_data += M('and show') + ' ' + mkws_html_perpage() + ' ' + M('per page') + '.';
 	}
         ranking_data += '</form>';
 
 	$("#mkwsRanking").html(ranking_data);
     }
 
-    mkws_html_switch(config);
+    mkws_html_switch();
 
     if (mkws_config.use_service_proxy)
-	mkws_service_proxy_auth(config.service_proxy_auth);
+	mkws_service_proxy_auth(mkws_config.service_proxy_auth);
 
-    if (mkws_config.responsive_design) {
+    if (mkws_config.responsive_design_width) {
 	// Responsive web design - change layout on the fly based on
 	// current screen width. Required for mobile devices.
 	$(window).resize( function(e) { mkws_resize_page() });
@@ -682,7 +674,7 @@ function mkws_html_all(config) {
     }
 }
 
-function mkws_set_lang(mkws_config)  {
+function mkws_set_lang()  {
     var lang = $.parseQuerystring().lang || mkws_config.lang || "";
     if (!lang || !mkws.locale_lang[lang]) {
 	mkws_config.lang = ""
@@ -694,7 +686,7 @@ function mkws_set_lang(mkws_config)  {
     return mkws_config.lang;
 }
 
-function mkws_html_switch(config) {
+function mkws_html_switch() {
     debug("HTML switch");
 
     $("#mkwsSwitch").append($('<a href="#" id="mkwsSwitch_records" onclick="mkws.switchView(\'records\')">' + M('Records') + '</a>'));
@@ -709,16 +701,17 @@ function mkws_html_switch(config) {
     $("#mkwsTargets").css("display", "none");
 }
 
-function mkws_html_sort(config) {
+function mkws_html_sort() {
     debug("HTML sort");
     var sort_html = '<select name="mkwsSort" id="mkwsSort">';
 
-    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];
+    for(var i = 0; i < mkws_config.sort_options.length; i++) {
+	var opt = mkws_config.sort_options[i];
+	var key = opt[0];
+	var val = opt.length == 1 ? opt[0] : opt[1];
 
 	sort_html += '<option value="' + key + '"';
-	if (key == config.sort_default) {
+	if (key == mkws_config.sort_default) {
 	    sort_html += ' selected="selected"';
 	}
 	sort_html += '>' + val + '</option>';
@@ -728,15 +721,15 @@ function mkws_html_sort(config) {
     return sort_html;
 }
 
-function mkws_html_perpage(config) {
+function mkws_html_perpage() {
     debug("HTML perpage");
     var perpage_html = '<select name="mkwsPerpage" id="mkwsPerpage">';
 
-    for(var i = 0; i < config.perpage_options.length; i++) {
-	var key = config.perpage_options[i];
+    for(var i = 0; i < mkws_config.perpage_options.length; i++) {
+	var key = mkws_config.perpage_options[i];
 
 	perpage_html += '<option value="' + key + '"';
-	if (key == config.perpage_default) {
+	if (key == mkws_config.perpage_default) {
 	    perpage_html += ' selected="selected"';
 	}
 	perpage_html += '>' + key + '</option>';
@@ -779,7 +772,7 @@ function mkws_service_proxy_auth(auth_url) {
 }
 
 /* create locale language menu */
-function mkws_html_lang(mkws_config) {
+function mkws_html_lang() {
     var lang_default = "en";
     var lang = mkws_config.lang || lang_default;
     var list = [];
@@ -823,7 +816,7 @@ function mkws_html_lang(mkws_config) {
 function mkws_resize_page () {
     var list = ["mkwsSwitch"];
 
-    var width = mkws_config.responsive_design_width || 980;
+    var width = mkws_config.responsive_design_width;
     var parentId = $("#mkwsTermlists").parent().attr('id');
 
     if ($(window).width() <= width &&
@@ -1005,7 +998,7 @@ function init_popup(obj) {
 /* magic */
 $(document).ready(function() {
     try {
-	mkws_html_all(mkws_config)
+	mkws_html_all()
     }
 
     catch (e) {