X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=124b3115fb9723bcf7227d31e86b8337e09fd45a;hb=588dc0fed2bd1f9240418e05a87514796679223a;hp=7cd281efa63cc26a141ab54eca72540e65666ddb;hpb=51d96f88164240ddfceedaaae8b461a72bcded84;p=mkws-moved-to-github.git diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js index 7cd281e..124b311 100644 --- a/tools/htdocs/mkws.js +++ b/tools/htdocs/mkws.js @@ -3,11 +3,10 @@ "use strict"; // HTML5: disable for debug_level >= 2 -// Wrapper for jQuery -(function ($) { - // Set up namespace and some state. -var mkws = {}; +var mkws = { + filters: [], +}; /* * global config object: mkws_config @@ -18,6 +17,9 @@ var mkws = {}; if (!mkws_config) var mkws_config = {}; +// Wrapper for jQuery +(function ($) { + mkws.locale_lang = { "de": { "Authors": "Autoren", @@ -98,14 +100,48 @@ mkws.debug_function = function (string) { } var debug = mkws.debug_function; // local alias + +Handlebars.registerHelper('link', function(a) { + var result = ""; + for (var i in a) { + if (i > 0) result += "
"; + var text = Handlebars.Utils.escapeExpression(a[i]); + result += '' + text + ''; + } + + return new Handlebars.SafeString(result); +}); + + +Handlebars.registerHelper('json', function(obj) { + return JSON.stringify(obj); +}); + + +// We need {{attr name}} because Handlebars can't parse {{@@name}} +Handlebars.registerHelper('attr', function(attrName) { + return this['@' + attrName]; +}); + + +Handlebars.registerHelper('first', function(items, options) { + var having = options.hash.having; + for (var i in items) { + var item = items[i] + if (!having || item[having]) { + return options.fn(item); + } + } + return ""; +}); + + { /* default mkws config */ - /* ### No defaults given for: - * lang 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", @@ -148,6 +184,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 + "'"); } } } @@ -177,7 +214,6 @@ var totalRec = 0; var curDetRecId = ''; var curDetRecData = null; var curSort = 'relevance'; -var curFilter = null; var submitted = false; var SourceMax = 16; var SubjectMax = 10; @@ -195,12 +231,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"); @@ -230,11 +269,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) { @@ -255,9 +294,9 @@ function my_onterm(data) { if (facets[i] == "sources") { add_single_facet(acc, "Sources", data.xtargets, SourceMax, null); } else if (facets[i] == "subjects") { - add_single_facet(acc, "Subjects", data.subject, SubjectMax, "su"); + add_single_facet(acc, "Subjects", data.subject, SubjectMax, "subject"); } else if (facets[i] == "authors") { - add_single_facet(acc, "Authors", data.author, AuthorMax, "au"); + add_single_facet(acc, "Authors", data.author, AuthorMax, "author"); } else { alert("bad facet configuration: '" + facets[i] + "'"); } @@ -267,19 +306,19 @@ function my_onterm(data) { replaceHtml(termlist, acc.join('')); } -function add_single_facet(acc, caption, data, max, cclIndex) { +function add_single_facet(acc, caption, data, max, pzIndex) { acc.push('
'); acc.push('
' + M(caption) + '
'); for (var i = 0; i < data.length && i < max; i++ ) { acc.push('
'); acc.push('' + data[i].name + '' + ' ' + data[i].freq + ''); @@ -307,8 +346,13 @@ function my_onbytarget(data) { return; } - var table ='' - +''; + var table ='
Target IDHitsDiagsRecordsState
' + + '' + + '' + + '' + + '' + + '' + + ''; for (var i = 0; i < data.length; i++ ) { table += "'; + } else { + details += renderField("Location" + (locations.length == 1 ? "" : "s"), locations); + } + details += '
' + M('Target ID') + '' + M('Hits') + '' + M('Diags') + '' + M('Records') + '' + M('State') + '
" + data[i].id + @@ -366,7 +410,24 @@ function resetPage() function triggerSearch () { - my_paz.search(document.mkwsSearchForm.mkwsQuery.value, recPerPage, curSort, curFilter); + var pp2filter = ""; + var pp2limit = ""; + + for (var i in mkws.filters) { + var filter = mkws.filters[i]; + if (filter.id) { + if (pp2filter) + pp2filter += ","; + pp2filter += 'pz:id=' + filter.id; + } else { + if (pp2limit) + pp2limit += ","; + pp2limit += filter.field + "=" + filter.value.replace(/[\\|,]/g, '\\$&'); + } + } + + debug("triggerSearch: filters = " + JSON.stringify(mkws.filters) + ", pp2filter = " + pp2filter + ", pp2limit = " + pp2limit); + my_paz.search(document.mkwsSearchForm.mkwsQuery.value, recPerPage, curSort, pp2filter, undefined, { limit: pp2limit }); } function loadSelect () @@ -382,35 +443,100 @@ function loadSelect () // limit the query after clicking the facet mkws.limitQuery = function (field, value) { - document.mkwsSearchForm.mkwsQuery.value += ' and ' + field + '="' + value + '"'; - onFormSubmitEventHandler(); + debug("limitQuery(field=" + field + ", value=" + value + ")"); + mkws.filters.push({ field: field, value: value }); + redraw_navi(); + resetPage(); + loadSelect(); + triggerSearch(); + return false; } // limit by target functions mkws.limitTarget = function (id, name) { - var navi = document.getElementById('mkwsNavi'); - navi.innerHTML = - 'Source: ' - + name + ''; - curFilter = 'pz:id=' + id; + debug("limitTarget(id=" + id + ", name=" + name + ")"); + mkws.filters.push({ id: id, name: name }); + redraw_navi(); resetPage(); loadSelect(); triggerSearch(); return false; } -mkws.delimitTarget = function () +mkws.delimitQuery = function (field, value) { - var navi = document.getElementById('mkwsNavi'); - navi.innerHTML = ''; - curFilter = null; + debug("delimitQuery(field=" + field + ", value=" + value + ")"); + var newFilters = []; + for (var i in mkws.filters) { + var filter = mkws.filters[i]; + if (filter.field && + field == filter.field && + value == filter.value) { + debug("delimitTarget() removing filter " + JSON.stringify(filter)); + } else { + debug("delimitTarget() keeping filter " + JSON.stringify(filter)); + newFilters.push(filter); + } + } + mkws.filters = newFilters; + + redraw_navi(); resetPage(); loadSelect(); triggerSearch(); return false; } + +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; + + redraw_navi(); + resetPage(); + loadSelect(); + triggerSearch(); + return false; +} + + +function redraw_navi () +{ + var navi = document.getElementById('mkwsNavi'); + if (!navi) return; + + var text = ""; + for (var i in mkws.filters) { + if (text) { + text += " | "; + } + var filter = mkws.filters[i]; + if (filter.id) { + text += 'Source: ' + filter.name + ''; + } else { + text += filter.field + ': ' + filter.value + ''; + } + } + + navi.innerHTML = text; +} + + function drawPager (pagerDiv) { //client indexes pages from 1 but pz2 from 0 @@ -550,38 +676,89 @@ function replaceHtml(el, html) { function renderDetails(data, marker) { - var details = '
'; - if (marker) details += ''; + if (mkws.templateRecord === undefined) { + maybeLoadTemplate("Record"); + } + + var details; + if (mkws.templateRecord) { + var template = mkws.templateRecord; + details = template(data); + } else { + details = defaultRenderDetails(data, marker); + } + + return '
' + details + '
'; +} + + +function maybeLoadTemplate(name) +{ + var source = $("#mkwsTemplate" + name).html(); + if (!source) { + debug("no template '" + name + "': falling back to default behaviour"); + // Mark template as not provided + mkws['template' + name] = 0; + return; + } + + var template = Handlebars.compile(source); + debug("compiled template '" + name + "'"); + mkws['template' + name] = template; +} + + +function defaultRenderDetails(data, marker) +{ + var details = '
'+ marker + '
'; + if (marker) details += ''; + + 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"]); - details += '
'+ marker + '
'; - + if (locations.length == 0) { + details += '
No locations for record!
'; return details; } + function renderField(caption, data, data2, data3) { if (data === undefined) { 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 + ''; } @@ -651,7 +828,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 @@ -675,7 +853,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 { @@ -714,7 +892,7 @@ function mkws_html_sort() { if (key == mkws_config.sort_default) { sort_html += ' selected="selected"'; } - sort_html += '>' + val + ''; + sort_html += '>' + M(val) + ''; } sort_html += ''; @@ -744,13 +922,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) { +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)) {