X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=tools%2Fhtdocs%2Fmkws.js;h=ee13dba15fa719cd7a6e2ceab197954a466b89f5;hb=c3390fc0d2188fda0e382a3ee8eca39de2be0a2c;hp=3ed38bb3077d08bba57842eb51448717e9f964d8;hpb=a93069ae5cc34476d41d35e9089bc3535ae6fdaa;p=mkws-moved-to-github.git
diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 3ed38bb..ee13dba 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -3,9 +3,6 @@
"use strict"; // HTML5: disable for debug_level >= 2
-// Wrapper for jQuery
-(function ($) {
-
// Set up namespace and some state.
var mkws = {};
@@ -18,6 +15,9 @@ var mkws = {};
if (!mkws_config)
var mkws_config = {};
+// Wrapper for jQuery
+(function ($) {
+
mkws.locale_lang = {
"de": {
"Authors": "Autoren",
@@ -100,11 +100,10 @@ var debug = mkws.debug_function; // local alias
{
/* default mkws config */
- /* ### No defaults given for:
- * lang, service_proxy_auth and of course the optional language_* entries.
- */
var config_default = {
use_service_proxy: true,
+ service_proxy_auth: "http://mkws.indexdata.com/service-proxy-auth",
+ lang: "",
sort_options: [["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]],
perpage_options: [10, 20, 30, 50],
sort_default: "relevance",
@@ -147,6 +146,7 @@ for (var key in mkws_config) {
var lang = key.replace(/^language_/, "");
// Copy custom languages into list
mkws.locale_lang[lang] = mkws_config[key];
+ debug("Added locally configured language '" + lang + "'");
}
}
}
@@ -194,12 +194,15 @@ function my_onshow(data) {
totalRec = data.merged;
// move it out
var pager = document.getElementById("mkwsPager");
- pager.innerHTML = "";
- pager.innerHTML +='
' + M('Displaying') + ': '
- + (data.start + 1) + ' ' + M('to') + ' ' + (data.start + data.num) +
- ' ' + M('of') + ' ' + data.merged + ' (' + M('found') + ': '
- + data.total + ')
';
- drawPager(pager);
+ if (pager) {
+ pager.innerHTML = "";
+ pager.innerHTML +='' + M('Displaying') + ': '
+ + (data.start + 1) + ' ' + M('to') + ' ' + (data.start + data.num) +
+ ' ' + M('of') + ' ' + data.merged + ' (' + M('found') + ': '
+ + data.total + ')
';
+ drawPager(pager);
+ }
+
// navi
var results = document.getElementById("mkwsRecords");
@@ -229,11 +232,11 @@ function my_onstat(data) {
if (stat == null)
return;
- stat.innerHTML = 'Status info' +
+ stat.innerHTML = '' + M('Status info') + '' +
' -- ' +
- '' + data.activeclients + '/' + data.clients + '' +
+ '' + M('Active clients') + ': ' + data.activeclients + '/' + data.clients + '' +
' -- ' +
- '' + data.records + '/' + data.hits + '';
+ '' + M('Retrieved records') + ': ' + data.records + '/' + data.hits + '';
}
function my_onterm(data) {
@@ -306,8 +309,13 @@ function my_onbytarget(data) {
return;
}
- var table ='Target ID | Hits | Diags | '
- +'Records | State |
';
+ var table ='' +
+ '' + M('Target ID') + ' | ' +
+ '' + M('Hits') + ' | ' +
+ '' + M('Diags') + ' | ' +
+ '' + M('Records') + ' | ' +
+ '' + M('State') + ' | ' +
+ '
';
for (var i = 0; i < data.length; i++ ) {
table += "" + data[i].id +
@@ -550,14 +558,23 @@ function replaceHtml(el, html) {
function renderDetails(data, marker)
{
var details = '';
- if (marker) details += ''+ marker + ' | ';
+ if (marker) details += ''+ marker + ' | ';
+
+ var locations = [];
+ for (var i in data.location) {
+ locations.push(data.location[i]['@name']);
+ }
details += renderField("Title", data["md-title"], data["md-title-remainder"], data["md-title-responsibility"]);
details += renderField("Date", data["md-date"]);
details += renderField("Author", data["md-author"]);
details += renderField("URL", data["md-electronic-url"]);
details += renderField("Subject", data["location"][0]["md-subject"]);
- details += renderField("Location", data["location"][0]["@name"], data["location"][0]["@id"]);
+ if (locations.length == 0) {
+ details += 'No locations for record! | ';
+ } else {
+ details += renderField("Location" + (locations.length == 1 ? "" : "s"), locations);
+ }
details += ' ';
return details;
@@ -568,19 +585,27 @@ function renderField(caption, data, data2, data3) {
return "";
}
- if (caption == "URL") {
- data = '' + data + '';
+ var res = "";
+ for (var i = 0; i < data.length; i++) {
+ var s = data[i];
+ if (i > 0)
+ res += ", ";
+
+ if (caption == "URL")
+ s = '' + s + '';
+
+ res += s
}
if (data2 != undefined) {
- data = data + " (" + data2 + ")";
+ res = res + " (" + data2 + ")";
}
if (data3 != undefined) {
- data = data + " " + data3 + "";
+ res = res + " " + data3 + "";
}
- return ' |
' + M(caption) + ' | ' + data + ' |
';
+ return '' + M(caption) + ' | ' + res + ' |
';
}
@@ -650,7 +675,8 @@ function mkws_html_all() {
mkws_html_switch();
if (mkws_config.use_service_proxy)
- mkws_service_proxy_auth(mkws_config.service_proxy_auth);
+ mkws_service_proxy_auth(mkws_config.service_proxy_auth,
+ mkws_config.service_proxy_auth_domain);
if (mkws_config.responsive_design_width) {
// Responsive web design - change layout on the fly based on
@@ -674,7 +700,7 @@ function mkws_html_all() {
}
function mkws_set_lang() {
- var lang = $.parseQuerystring().lang || mkws_config.lang || "";
+ var lang = $.parseQuerystring().lang || mkws_config.lang;
if (!lang || !mkws.locale_lang[lang]) {
mkws_config.lang = ""
} else {
@@ -713,7 +739,7 @@ function mkws_html_sort() {
if (key == mkws_config.sort_default) {
sort_html += ' selected="selected"';
}
- sort_html += '>' + val + '';
+ sort_html += '>' + M(val) + '';
}
sort_html += '';
@@ -743,16 +769,13 @@ function mkws_html_perpage() {
* The username/password is configured in the apache config file
* for the site.
*/
-function mkws_service_proxy_auth(auth_url) {
- if (!auth_url)
- auth_url = "http://mkws.indexdata.com/service-proxy-auth";
-
+function mkws_service_proxy_auth(auth_url, auth_domain) {
debug("Run service proxy auth URL: " + auth_url);
var request = new pzHttpRequest(auth_url, function(err) {
- alert("HTTP call for authentication failed: " + err)
- return;
- });
+ alert("HTTP call for authentication failed: " + err)
+ return;
+ }, auth_domain);
request.get(null, function(data) {
if (!$.isXMLDoc(data)) {
@@ -846,7 +869,7 @@ function M(word) {
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] || word;
}
/*