X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=tools%2Fhtdocs%2Fmkws.js;h=ee13dba15fa719cd7a6e2ceab197954a466b89f5;hb=c3390fc0d2188fda0e382a3ee8eca39de2be0a2c;hp=e2487986974be47955b1e8d8dd15b5b4a389717f;hpb=aea21016afd934b016698abb7f26611d349c72a0;p=mkws-moved-to-github.git
diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index e248798..ee13dba 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -194,12 +194,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");
@@ -557,16 +560,9 @@ function renderDetails(data, marker)
var details = '';
if (marker) details += ''+ marker + ' |
';
- var sources = [];
+ var locations = [];
for (var i in data.location) {
- sources.push(data.location[i]['@name']);
- }
- if (sources.length == 0) {
- details += 'No sources for record! |
';
- } else if (sources.length == 1) {
- details += renderField("Source", sources[0]);
- } else {
- details += renderField("Sources", sources);
+ locations.push(data.location[i]['@name']);
}
details += renderField("Title", data["md-title"], data["md-title-remainder"], data["md-title-responsibility"]);
@@ -574,7 +570,11 @@ function renderDetails(data, marker)
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;
@@ -585,17 +585,16 @@ function renderField(caption, data, data2, data3) {
return "";
}
- var res = data;
- if (caption == "URL") {
- var tmp = "";
- for (var i = 0; i < data.length; i++) {
- var s = data[i];
- if (i > 0)
+ var res = "";
+ for (var i = 0; i < data.length; i++) {
+ var s = data[i];
+ if (i > 0)
+ res += ", ";
- tmp += ", ";
- tmp += '' + s + '';
- }
- res = tmp;
+ if (caption == "URL")
+ s = '' + s + '';
+
+ res += s
}
if (data2 != undefined) {
@@ -676,7 +675,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
@@ -769,13 +769,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)) {