X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=446fc7cac2ae8050218ef41256e4b791feb28c4a;hb=b49693f0b2ab2724444e64f6167ee65cfbbd951a;hp=a03789573a86cfb39e5fdc37e653a890a712e046;hpb=8a5cf1364faaa034d2ff39685c7477b33339eb71;p=mkws-moved-to-github.git
diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index a037895..446fc7c 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -264,24 +264,33 @@ function my_onshow(data) {
var html = [];
for (var i = 0; i < data.hits.length; i++) {
var hit = data.hits[i];
- html.push('
'
- +'
'
- + hit["md-title"] +' ');
- if (hit["md-title-remainder"] !== undefined) {
- html.push('
' + hit["md-title-remainder"] + ' ');
- }
- if (hit["md-title-responsibility"] !== undefined) {
- html.push('
'+hit["md-title-responsibility"]+'');
- }
- if (hit.recid == curDetRecId) {
- html.push(renderDetails(curDetRecData));
- }
- html.push('
');
+ html.push('',
+ renderSummary(hit),
+ '
');
}
replaceHtml(results, html.join(''));
}
+
+function renderSummary(hit)
+{
+ var html = [];
+ html.push(''
+ + hit["md-title"] +' ');
+ if (hit["md-title-remainder"] !== undefined) {
+ html.push('' + hit["md-title-remainder"] + ' ');
+ }
+ if (hit["md-title-responsibility"] !== undefined) {
+ html.push(''+hit["md-title-responsibility"]+'');
+ }
+ if (hit.recid == curDetRecId) {
+ html.push(renderDetails(curDetRecData));
+ }
+ return html.join('');
+}
+
+
function my_onstat(data) {
var stat = document.getElementById("mkwsStat");
if (stat == null)
@@ -698,14 +707,8 @@ function renderDetails(data, marker)
loadTemplate("Record");
}
- var details;
- if (mkws.templateRecord) {
- var template = mkws.templateRecord;
- details = template(data);
- } else {
- details = defaultRenderDetails(data, marker);
- }
-
+ var template = mkws.templateRecord;
+ var details = template(data);
return '' + details + '
';
}
@@ -791,60 +794,6 @@ function defaultTemplate(name)
}
-function defaultRenderDetails(data, marker)
-{
- var details = '';
- 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"]);
- if (locations.length == 0) {
- details += 'No locations for record! |
';
- } else {
- details += renderField("Location" + (locations.length == 1 ? "" : "s"), locations);
- }
- details += '
';
- return details;
-}
-
-
-function renderField(caption, data, data2, data3) {
- if (data === undefined) {
- return "";
- }
-
- 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) {
- res = res + " (" + data2 + ")";
- }
-
- if (data3 != undefined) {
- res = res + " " + data3 + "";
- }
-
- return '' + M(caption) + ' | ' + res + ' |
';
-}
-
-
/*
* All the HTML stuff to render the search forms and
* result pages.