';
+ drawPager(pager);
+ }
+
// navi
var results = document.getElementById("mkwsRecords");
@@ -173,7 +212,6 @@ function my_onshow(data) {
for (var i = 0; i < data.hits.length; i++) {
var hit = data.hits[i];
html.push('
';
return details;
@@ -535,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 + '
';
}
@@ -555,52 +633,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 */
- /* ### No defaults given for:
- * lang, responsive_design, service_proxy_auth, use_service_proxy
- * and of course the optional language_* entries.
- */
- 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,
- show_lang: true, /* show/hide language menu */
- show_sort: true, /* show/hide sort menu */
- show_perpage: 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 narrow */
- 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);
+function mkws_html_all() {
+ mkws_set_lang();
if (mkws_config.show_lang)
- mkws_html_lang(mkws_config);
+ mkws_html_lang();
// For some reason, doing this programmatically results in
// document.mkwsSearchForm.mkwsQuery being undefined, hence the raw HTML.
@@ -645,23 +681,24 @@ 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,
+ mkws_config.service_proxy_auth_domain);
- 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() });
@@ -682,8 +719,8 @@ function mkws_html_all(config) {
}
}
-function mkws_set_lang(mkws_config) {
- var lang = $.parseQuerystring().lang || mkws_config.lang || "";
+function mkws_set_lang() {
+ var lang = $.parseQuerystring().lang || mkws_config.lang;
if (!lang || !mkws.locale_lang[lang]) {
mkws_config.lang = ""
} else {
@@ -694,7 +731,7 @@ function mkws_set_lang(mkws_config) {
return mkws_config.lang;
}
-function mkws_html_switch(config) {
+function mkws_html_switch() {
debug("HTML switch");
$("#mkwsSwitch").append($('' + M('Records') + ''));
@@ -709,34 +746,35 @@ function mkws_html_switch(config) {
$("#mkwsTargets").css("display", "none");
}
-function mkws_html_sort(config) {
+function mkws_html_sort() {
debug("HTML sort");
var sort_html = '';
return sort_html;
}
-function mkws_html_perpage(config) {
+function mkws_html_perpage() {
debug("HTML perpage");
var perpage_html = '