X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=experiments%2Fspclient%2Fmkws.js;h=306efc01ebd77fe43ccc5733478614fe476905c7;hb=486460e232fe8c43c827410d0f43d073a40776ee;hp=0db3796775d345d53719cc740d8396cec36c341a;hpb=35b853ebae652a72c32d0f2444c5b1efe6c7e72e;p=mkws-moved-to-github.git
diff --git a/experiments/spclient/mkws.js b/experiments/spclient/mkws.js
index 0db3796..306efc0 100644
--- a/experiments/spclient/mkws.js
+++ b/experiments/spclient/mkws.js
@@ -1,19 +1,26 @@
/* A very simple client that shows a basic usage of the pz2.js
*/
-// "use strict"; // HTML5
+"use strict"; // HTML5: disable for debug >= 2
+
+/*
+ * global config object: mkws_config
+ *
+ * needs to be defined in the HTML header before
+ * including this JS file
+ */
-// global config object mkws_config
if (!mkws_config)
var mkws_config = {}; // for the guys who forgot to define mkws_config...
+var mkws_debug = 1;
+
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 : "/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 = 1;
var mkws_locale_lang = {
"de": {
@@ -442,10 +449,10 @@ function renderDetails(data, marker)
* All the HTML stuff to render the search forms and
* result pages.
*/
-function mkws_html_all(data) {
+function mkws_html_all(config) {
- /* default config */
- var config = {
+ /* default mkws config */
+ var mkws_config_default = {
sort: [["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]],
perpage: [10, 20, 30, 50],
sort_default: "relevance",
@@ -461,17 +468,19 @@ function mkws_html_all(data) {
};
/* set global debug flag early */
- if (data.debug !== 'undefined') {
- mkws_debug = data.debug;
- } else if (config.debug !== 'undefined') {
+ if (config.debug !== 'undefined') {
mkws_debug = config.debug;
+ } else if (mkws_config_default.debug !== 'undefined') {
+ mkws_debug = mkws_config_default.debug;
}
/* override standard config values by function parameters */
- for (var k in data) {
- config[k] = data[k];
- debug("Set config: " + k + ' => ' + data[k]);
+ 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;
@@ -657,7 +666,7 @@ function mkws_html_lang(mkws_config) {
if (lang == l) {
data += l;
} else {
- data += ' ' + l + ' '
+ data += ' ' + l + ' '
}
}
@@ -690,9 +699,8 @@ jQuery.extend({
function debug(string) {
if (!mkws_debug)
return;
-
- var console; // IE8 quirks
- if (!console) { /* ARGH!!! */
+
+ if (typeof console === "undefined" || typeof console.log === "undefined") { /* ARGH!!! old IE */
return;
}