X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=experiments%2Fspclient%2Fmkws.js;h=b29be6d17210470f2defebb11ecf0995dc4566d0;hb=af68e8696bfa9ecb022dc521acd5983f083c90c6;hp=6f202902541224022a590ac39028f2a6fd11b5a5;hpb=91e71dc5103a62f1e449eb9dcc40477ab3d4d0d4;p=mkws-moved-to-github.git
diff --git a/experiments/spclient/mkws.js b/experiments/spclient/mkws.js
index 6f20290..b29be6d 100644
--- a/experiments/spclient/mkws.js
+++ b/experiments/spclient/mkws.js
@@ -13,13 +13,13 @@
if (!mkws_config)
var mkws_config = {}; // for the guys who forgot to define mkws_config...
-if (mkws_config.use_service_proxy === 'undefined')
+if (typeof mkws_config.use_service_proxy === 'undefined')
mkws_config.use_service_proxy = true;
var mkws_debug = 1;
var pazpar2_url = mkws_config.pazpar2_url ? mkws_config.pazpar2_url : "/pazpar2/search.pz2";
-var service_proxy_url = mkws_config.service_proxy_url ? mkws_config.service_proxy_url : "/service-proxy/";
+var service_proxy_url = mkws_config.service_proxy_url ? mkws_config.service_proxy_url : "http://mkws.indexdata.com/service-proxy/";
var pazpar2path = mkws_config.use_service_proxy ? service_proxy_url : pazpar2_url;
var usesessions = mkws_config.use_service_proxy ? false : true;
@@ -30,7 +30,7 @@ var mkws_locale_lang = {
"Authors": "Autoren",
"Subjects": "Schlagwörter",
"Sources": "Daten und Quellen",
- "TERMLISTS": "Termlisten",
+ "Termlists": "Termlisten",
"Next": "Weiter",
"Prev": "Zurück",
"Search": "Suche",
@@ -54,7 +54,7 @@ var mkws_locale_lang = {
"Authors": "Forfattere",
"Subjects": "Emner",
"Sources": "Kilder",
- "TERMLISTS": "TERMLISTS",
+ "Termlists": "Termlists",
"Next": "Næste",
"Prev": "Forrige",
"Search": "Søg",
@@ -150,11 +150,11 @@ function my_onstat(data) {
if (stat == null)
return;
- stat.innerHTML = 'STATUS INFO -- Active clients: '
- + data.activeclients
- + '/' + data.clients + ' -- '
- + 'Retrieved records: ' + data.records
- + '/' + data.hits + ' :.';
+ stat.innerHTML = 'Status info' +
+ ' -- ' +
+ '' + data.activeclients + '/' + data.clients + '' +
+ ' -- ' +
+ '' + data.records + '/' + data.hits + '';
}
function my_onterm(data) {
@@ -162,20 +162,27 @@ function my_onterm(data) {
return;
var termlists = [];
- termlists.push('
' + M('TERMLISTS') + ':
' + M('Sources') + '
');
+ termlists.push('' + M('Termlists') + '
');
+
+ termlists.push('');
+ termlists.push('
' + M('Sources') + '
');
for (var i = 0; i < data.xtargets.length && i < SourceMax; i++ ) {
termlists.push('
' + data.xtargets[i].name
+ ' (' + data.xtargets[i].freq + ')');
}
+ termlists.push('
');
- termlists.push('
' + M('Subjects') + '
');
+ termlists.push('');
+ termlists.push('
' + M('Subjects') + '
');
for (var i = 0; i < data.subject.length && i < SubjectMax; i++ ) {
termlists.push('
' + data.subject[i].name + ' ('
+ data.subject[i].freq + ')');
}
+ termlists.push('
');
- termlists.push('
' + M('Authors') + '
');
+ termlists.push('');
+
var termlist = document.getElementById("termlist");
replaceHtml(termlist, termlists.join(''));
}
@@ -234,6 +243,7 @@ function onFormSubmitEventHandler()
resetPage();
loadSelect();
triggerSearch();
+ switchView('records'); // In case it's configured to start off as hidden
submitted = true;
return false;
}
@@ -369,15 +379,23 @@ function switchView(view) {
var targets = document.getElementById('mkwsTargets');
var records = document.getElementById('mkwsRecords');
+ var blanket = document.getElementById('mkwsBlanket');
switch(view) {
case 'targets':
targets.style.display = "block";
records.style.display = "none";
+ if (blanket) { blanket.style.display = "none"; }
break;
case 'records':
targets.style.display = "none";
records.style.display = "block";
+ if (blanket) { blanket.style.display = "block"; }
+ break;
+ case 'none':
+ targets.style.display = "none";
+ records.style.display = "none";
+ if (blanket) { blanket.style.display = "none"; }
break;
default:
alert('Unknown view.');
@@ -424,30 +442,39 @@ function renderDetails(data, marker)
{
var details = '';
if (marker) details += ''+ marker + ' |
';
- if (data["md-title"] != undefined) {
- details += '' + M('Title') + ' | : '+data["md-title"];
- if (data["md-title-remainder"] !== undefined) {
- details += ' : ' + data["md-title-remainder"] + ' ';
- }
- if (data["md-title-responsibility"] !== undefined) {
- details += ' '+ data["md-title-responsibility"] +'';
- }
- details += ' |
';
- }
- if (data["md-date"] != undefined)
- details += '' + M('Date') + ' | : ' + data["md-date"] + ' |
';
- if (data["md-author"] != undefined)
- details += '' + M('Author') + ' | : ' + data["md-author"] + ' |
';
- if (data["md-electronic-url"] != undefined)
- details += 'URL | : ' + data["md-electronic-url"] + '' + ' |
';
- if (data["location"][0]["md-subject"] != undefined)
- details += '' + M('Subject') + ' | : ' + data["location"][0]["md-subject"] + ' |
';
- if (data["location"][0]["@name"] != undefined)
- details += '' + M('Location') + ' | : ' + data["location"][0]["@name"] + " (" +data["location"][0]["@id"] + ")" + ' |
';
+
+ 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 += '
';
+
return details;
}
+function renderField(caption, data, data2, data3) {
+ if (data === undefined) {
+ return "";
+ }
+
+ if (caption == "URL") {
+ data = '' + data + '';
+ }
+
+ if (data2 != undefined) {
+ data = data + " (" + data2 + ")";
+ }
+
+ if (data3 != undefined) {
+ data = data + " " + data3 + "";
+ }
+
+ return '' + M(caption) + ' | ' + data + ' |
';
+}
+
+
/*
* All the HTML stuff to render the search forms and
* result pages.
@@ -512,7 +539,7 @@ function mkws_html_all(config) {
\
\
\
@@ -615,25 +642,22 @@ function mkws_html_perpage(config) {
*/
function mkws_service_proxy_auth(auth_url) {
if (!auth_url)
- auth_url = "/service-proxy-auth";
+ auth_url = "http://mkws.indexdata.com/service-proxy-auth";
debug("Run service proxy auth URL: " + auth_url);
- var jqxhr = jQuery.get(auth_url)
- .fail(function() {
- alert("service proxy authentication failed, give up!");
- })
- .success(function(data) {
- if (!jQuery.isXMLDoc(data)) {
- alert("service proxy auth response document is not valid XML document, give up!");
- return;
- }
- var status = $(data).find("status");
- if (status.text() != "OK") {
- alert("service proxy auth repsonse status: " + status.text() + ", give up!");
- return;
- }
- });
+ var request = new pzHttpRequest(auth_url);
+ request.get(null, function(data) {
+ if (!jQuery.isXMLDoc(data)) {
+ alert("service proxy auth response document is not valid XML document, give up!");
+ return;
+ }
+ var status = $(data).find("status");
+ if (status.text() != "OK") {
+ alert("service proxy auth repsonse status: " + status.text() + ", give up!");
+ return;
+ }
+ });
}
/* create locale language menu */
@@ -669,7 +693,7 @@ function mkws_html_lang(mkws_config) {
data += ' | ';
if (lang == l) {
- data += l;
+ data += ' ' + l + ' ';
} else {
data += ' ' + l + ' '
}
|