';
+ drawPager(pager);
+ }
+
// navi
var results = document.getElementById("mkwsRecords");
@@ -140,9 +222,8 @@ function my_onshow(data) {
for (var i = 0; i < data.hits.length; i++) {
var hit = data.hits[i];
html.push('
');
}
@@ -236,8 +316,18 @@ function my_onrecord(data) {
function my_onbytarget(data) {
var targetDiv = document.getElementById("mkwsBytarget");
- var table ='
Target ID
Hits
Diags
'
- +'
Records
State
';
+ if (!targetDiv) {
+ // No mkwsTargets div.
+ return;
+ }
+
+ 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 +
@@ -273,7 +363,7 @@ function onFormSubmitEventHandler()
resetPage();
loadSelect();
triggerSearch();
- switchView('records'); // In case it's configured to start off as hidden
+ mkws.switchView('records'); // In case it's configured to start off as hidden
submitted = true;
return false;
}
@@ -295,7 +385,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 ()
@@ -309,37 +416,102 @@ function loadSelect ()
}
// limit the query after clicking the facet
-function limitQuery (field, value)
+mkws.limitQuery = function (field, value)
{
- document.mkwsSearchForm.query.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
-function limitTarget (id, name)
+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;
}
-function delimitTarget ()
+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
@@ -356,7 +528,7 @@ function drawPager (pagerDiv)
var prev = '<< ' + M('Prev') + ' | ';
if (curPage > 1)
- prev = ''
+ prev = ''
+'<< ' + M('Prev') + ' | ';
var middle = '';
@@ -365,13 +537,13 @@ function drawPager (pagerDiv)
if(i == curPage)
numLabel = '' + i + '';
- middle += ' '
+ middle += ' '
+ numLabel + ' ';
}
var next = ' | ' + M('Next') + ' >>';
if (pages - curPage > 0)
- next = ' | '
+ next = ' | '
+ M('Next') + ' >>';
var predots = '';
@@ -386,7 +558,7 @@ function drawPager (pagerDiv)
+ prev + predots + middle + postdots + next + '';
}
-function showPage (pageNum)
+mkws.showPage = function (pageNum)
{
curPage = pageNum;
my_paz.showPage( curPage - 1 );
@@ -394,26 +566,28 @@ function showPage (pageNum)
// simple paging functions
-function pagerNext() {
+mkws.pagerNext = function () {
if ( totalRec - recPerPage*curPage > 0) {
my_paz.showNext();
curPage++;
}
}
-function pagerPrev() {
+mkws.pagerPrev = function () {
if ( my_paz.showPrev() != false )
curPage--;
}
// switching view between targets and records
-function switchView(view) {
+mkws.switchView = function(view) {
+ debug("switchView: " + view);
+
var targets = document.getElementById('mkwsTargets');
var results = document.getElementById('mkwsResults') ||
document.getElementById('mkwsRecords');
var blanket = document.getElementById('mkwsBlanket');
- var motd = document.getElementById('mkwsEmbeddedMOTD');
+ var motd = document.getElementById('mkwsMOTD');
switch(view) {
case 'targets':
@@ -440,7 +614,7 @@ function switchView(view) {
}
// detailed record drawing
-function showDetails (prefixRecId) {
+mkws.showDetails = function (prefixRecId) {
var recId = prefixRecId.replace('mkwsRec_', '');
var oldRecId = curDetRecId;
curDetRecId = recId;
@@ -477,38 +651,89 @@ function replaceHtml(el, html) {
function renderDetails(data, marker)
{
- var details = '
';
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 + '
';
}
@@ -516,49 +741,10 @@ function renderField(caption, data, data2, data3) {
* All the HTML stuff to render the search forms and
* result pages.
*/
-function mkws_html_all(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",
- perpage_default: 20,
- query_width: 50,
- switch_menu: false, /* show/hide Records|Targets menu */
- 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 */
- facets: ["sources", "subjects", "authors"], /* display facets, in this order, [] for none */
- responsive_design_width: 980, /* a page with less pixel width considered as mobile */
- debug: 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;
- }
-
- /* 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];
- 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;
- }
-
- mkws_set_lang(mkws_config);
- if (mkws_config.lang_menu)
- mkws_html_lang(mkws_config);
+function mkws_html_all() {
+ 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.
@@ -582,15 +768,19 @@ function mkws_html_all(config) {
$("#mkwsResults").html('\
\
\
-
\
+
\
\
\
-
\
+
\
\
\
\
\
- \
+
\
+
\
+
\
+
\
+ \
\
\
');
@@ -599,56 +789,47 @@ 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);
-
- if (mkws_config.responsive_design)
- mkws_responsive_design();
+ 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
+ // current screen width. Required for mobile devices.
+ $(window).resize( function(e) { mkws_resize_page() });
+ // initial check after page load
+ $(document).ready(function() { mkws_resize_page() });
+ }
domReady();
// on first page, hide the termlist
$(document).ready(function() { $("#mkwsTermlists").hide(); } );
- var elem = document.getElementById("mkwsMOTD");
- if (elem) {
- // Move the MOTD from the provided element down into the embedded one
- document.getElementById("mkwsEmbeddedMOTD").innerHTML = elem.innerHTML;
- elem.style.display = "none";
+ var motd = document.getElementById("mkwsMOTD");
+ var container = document.getElementById("mkwsMOTDContainer");
+ if (motd && container) {
+ // Move the MOTD from the provided element down into the container
+ motd.parentNode.removeChild(motd);
+ container.appendChild(motd);
}
}
-/* Responsive web design - change layout on the fly depending on
- * the current screen size width/height. Required for mobile devices.
- */
-function mkws_responsive_design () {
- var timeout = null;
-
- $(window).resize( function(e) {
- if (timeout)
- clearTimeout(timeout);
- timeout = setTimeout(function () { mkws_mobile_resize() }, 50);
- });
-
- // initial check after page load
- $(document).ready(function() { mkws_mobile_resize() });
-}
-
-function mkws_set_lang(mkws_config) {
- var lang = jQuery.parseQuerystring().lang || mkws_config.lang || "";
- if (!lang || !mkws_locale_lang[lang]) {
+function mkws_set_lang() {
+ var lang = $.parseQuerystring().lang || mkws_config.lang;
+ if (!lang || !mkws.locale_lang[lang]) {
mkws_config.lang = ""
} else {
mkws_config.lang = lang;
@@ -658,20 +839,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: "switchView(\'records\')",
- text: M("Records")
- }));
+ $("#mkwsSwitch").append($('' + M('Records') + ''));
$("#mkwsSwitch").append($("", { text: " | " }));
- $("#mkwsSwitch").append($("", {
- href: '#',
- onclick: "switchView(\'targets\')",
- text: M("Targets")
- }));
+ $("#mkwsSwitch").append($('' + M('Targets') + ''));
debug("HTML targets");
$("#mkwsTargets").html('\
@@ -679,41 +852,37 @@ function mkws_html_switch(config) {
No information available yet.\