X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=tools%2Fhtdocs%2Fmkws.js;h=41ad8499f169d0cedaa442d855c894f23d92a2c7;hb=1af25740efab904cae67b3ff8fc6c9190c109dc0;hp=44a35a0efb32525f89194cde6a3fa0198823c3a1;hpb=678d2261ad63016d4206716750537deb9ea242c6;p=mkws-moved-to-github.git
diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 44a35a0..41ad849 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -1,31 +1,29 @@
/* A very simple client that shows a basic usage of the pz2.js
*/
-"use strict"; // HTML5: disable for debug >= 2
+"use strict"; // HTML5: disable for debug_level >= 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
*
- * 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 = {};
+
+// Wrapper for jQuery
+(function ($) {
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 pazpar2_url = mkws_config.pazpar2_url || "http://mkws.indexdata.com/service-proxy/";
-mkws.pazpar2path = mkws_config.use_service_proxy ? service_proxy_url : pazpar2_url;
+mkws.pazpar2path = pazpar2_url;
mkws.usesessions = mkws_config.use_service_proxy ? false : true;
mkws.locale_lang = {
@@ -49,6 +47,7 @@ mkws.locale_lang = {
"Date": "Datum",
"Subject": "Schlagwort",
"Location": "Ort",
+ // ### to add: Records, Targets
"dummy": "dummy"
},
@@ -73,6 +72,7 @@ mkws.locale_lang = {
"Date": "Dato",
"Subject": "Emneord",
"Location": "Lokation",
+ // ### to add: Records, Targets
"dummy": "dummy"
}
@@ -83,8 +83,8 @@ 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 */
@@ -96,14 +96,14 @@ 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
for (var key in mkws_config) {
if (mkws_config.hasOwnProperty(key)) {
@@ -171,7 +171,6 @@ function my_onshow(data) {
for (var i = 0; i < data.hits.length; i++) {
var hit = data.hits[i];
html.push('
'
- +''+ (i + 1 + recPerPage * (curPage - 1)) +'. '
+''
+ hit["md-title"] +' ');
@@ -391,7 +390,7 @@ function drawPager (pagerDiv)
var prev = '<< ' + M('Prev') + ' | ';
if (curPage > 1)
- prev = ''
+ prev = ''
+'<< ' + M('Prev') + ' | ';
var middle = '';
@@ -436,7 +435,7 @@ mkws.pagerNext = function () {
}
}
-function pagerPrev() {
+mkws.pagerPrev = function () {
if ( my_paz.showPrev() != false )
curPage--;
}
@@ -444,6 +443,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');
@@ -551,37 +552,41 @@ function renderField(caption, data, data2, data3) {
* All the HTML stuff to render the search forms and
* result pages.
*/
-function mkws_html_all(config) {
+function mkws_html_all() {
/* default mkws config */
- var mkws_config_default = {
- sort: [["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]],
- perpage: [10, 20, 30, 50],
+ /* ### 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,
- 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 */
+ 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 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;
+ /* 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 mkws_config_default) {
- if (typeof config[k] === 'undefined')
- mkws_config[k] = mkws_config_default[k];
+ 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]);
}
@@ -590,9 +595,9 @@ function mkws_html_all(config) {
mkws_config.query_width = 50;
}
- mkws_set_lang(mkws_config);
- if (mkws_config.lang_menu)
- mkws_html_lang(mkws_config);
+ mkws_set_lang();
+ if (mkws_config.show_lang)
+ mkws_html_lang();
// For some reason, doing this programmatically results in
// document.mkwsSearchForm.mkwsQuery being undefined, hence the raw HTML.
@@ -637,23 +642,23 @@ function mkws_html_all(config) {
if ($("#mkwsRanking").length) {
var ranking_data = '';
ranking_data += '';
$("#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() });
@@ -674,7 +679,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 = ""
@@ -686,20 +691,12 @@ function mkws_set_lang(mkws_config) {
return mkws_config.lang;
}
-function mkws_html_switch(config) {
+function mkws_html_switch() {
debug("HTML switch");
- $("#mkwsSwitch").html($("", {
- href: '#',
- onclick: "mkws.switchView(\'records\')",
- text: M("Records")
- }));
+ $("#mkwsSwitch").append($('' + M('Records') + ''));
$("#mkwsSwitch").append($("", { text: " | " }));
- $("#mkwsSwitch").append($("", {
- href: '#',
- onclick: "mkws.switchView(\'targets\')",
- text: M("Targets")
- }));
+ $("#mkwsSwitch").append($('' + M('Targets') + ''));
debug("HTML targets");
$("#mkwsTargets").html('\
@@ -709,16 +706,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 = '