X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=tools%2Fhtdocs%2Fmkws.js;h=98b9ff83dc76c08c2df3c1d2d03d785c935c5459;hb=ba0d56aad3966dab761111933116579ae133b615;hp=ea6bbdd234b22c0aea6db9826fff6d67f13c6d26;hpb=d7fa203c58fd4eb63c6fc1eeeb3ffa94ef32dbb4;p=mkws-moved-to-github.git
diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index ea6bbdd..98b9ff8 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -3,11 +3,11 @@
"use strict"; // HTML5: disable for debug_level >= 2
-// Wrapper for jQuery
-(function ($) {
-
// Set up namespace and some state.
-var mkws = {};
+var mkws = {
+ filters: [],
+ pp2filter: null,
+};
/*
* global config object: mkws_config
@@ -18,6 +18,9 @@ var mkws = {};
if (!mkws_config)
var mkws_config = {};
+// Wrapper for jQuery
+(function ($) {
+
mkws.locale_lang = {
"de": {
"Authors": "Autoren",
@@ -98,40 +101,41 @@ mkws.debug_function = function (string) {
}
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,
- 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;
-}
+{
+ /* default mkws config */
+ 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",
+ 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]);
+ /* 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) {
@@ -145,6 +149,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 + "'");
}
}
}
@@ -174,7 +179,6 @@ var totalRec = 0;
var curDetRecId = '';
var curDetRecData = null;
var curSort = 'relevance';
-var curFilter = null;
var submitted = false;
var SourceMax = 16;
var SubjectMax = 10;
@@ -192,12 +196,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");
@@ -227,11 +234,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) {
@@ -304,8 +311,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 +
@@ -363,7 +375,8 @@ function resetPage()
function triggerSearch ()
{
- my_paz.search(document.mkwsSearchForm.mkwsQuery.value, recPerPage, curSort, curFilter);
+ debug("triggerSearch: filters = " + JSON.stringify(mkws.filters));
+ my_paz.search(document.mkwsSearchForm.mkwsQuery.value, recPerPage, curSort, mkws.pp2filter);
}
function loadSelect ()
@@ -379,6 +392,8 @@ function loadSelect ()
// limit the query after clicking the facet
mkws.limitQuery = function (field, value)
{
+ debug("limitQuery(field=" + field + ", value=" + value + ")");
+ mkws.filters.push({ field: field, value: value });
document.mkwsSearchForm.mkwsQuery.value += ' and ' + field + '="' + value + '"';
onFormSubmitEventHandler();
}
@@ -386,22 +401,37 @@ mkws.limitQuery = function (field, value)
// limit by target functions
mkws.limitTarget = function (id, name)
{
+ debug("limitTarget(id=" + id + ", name=" + name + ")");
+ mkws.filters.push({ id: id, name: name });
var navi = document.getElementById('mkwsNavi');
navi.innerHTML =
- 'Source: '
+ 'Source: '
+ name + '';
- curFilter = 'pz:id=' + id;
+ mkws.pp2filter = 'pz:id=' + id;
resetPage();
loadSelect();
triggerSearch();
return false;
}
-mkws.delimitTarget = function ()
+mkws.delimitTarget = function (id)
{
+ debug("delimitTarget(id=" + id + ")");
+ var newFilters = [];
+ for (var i in mkws.filters) {
+ var filter = mkws.filters[i];
+ if (filter.id) {
+ debug("delimitTarget() removing filter " + JSON.stringify(filter));
+ } else {
+ debug("delimitTarget() keeping filter " + JSON.stringify(filter));
+ newFilters.push(filter);
+ }
+ }
+ mkws.filters = newFilters;
+
var navi = document.getElementById('mkwsNavi');
navi.innerHTML = '';
- curFilter = null;
+ mkws.pp2filter = null;
resetPage();
loadSelect();
triggerSearch();
@@ -548,14 +578,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;
@@ -566,19 +605,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 + ' |
';
}
@@ -648,7 +695,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
@@ -672,7 +720,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 {
@@ -711,7 +759,7 @@ function mkws_html_sort() {
if (key == mkws_config.sort_default) {
sort_html += ' selected="selected"';
}
- sort_html += '>' + val + '';
+ sort_html += '>' + M(val) + '';
}
sort_html += '';
@@ -741,16 +789,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)) {
@@ -844,7 +889,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;
}
/*