X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=experiments%2Fspclient%2Fmkws.js;h=b29be6d17210470f2defebb11ecf0995dc4566d0;hb=8d5d8113fbe6cfe3e4061dff828eb0fddae2061c;hp=306efc01ebd77fe43ccc5733478614fe476905c7;hpb=486460e232fe8c43c827410d0f43d073a40776ee;p=mkws-moved-to-github.git diff --git a/experiments/spclient/mkws.js b/experiments/spclient/mkws.js index 306efc0..b29be6d 100644 --- a/experiments/spclient/mkws.js +++ b/experiments/spclient/mkws.js @@ -13,10 +13,13 @@ if (!mkws_config) var mkws_config = {}; // for the guys who forgot to define mkws_config... +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; @@ -27,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", @@ -51,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", @@ -147,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) { @@ -159,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('
'); + termlists.push('
' + M('Authors') + '
'); for (var i = 0; i < data.author.length && i < AuthorMax; i++ ) { termlists.push('' + data.author[i].name @@ -180,6 +190,8 @@ function my_onterm(data) { + data.author[i].freq + ')
'); } + termlists.push('
'); + var termlist = document.getElementById("termlist"); replaceHtml(termlist, termlists.join('')); } @@ -231,6 +243,7 @@ function onFormSubmitEventHandler() resetPage(); loadSelect(); triggerSearch(); + switchView('records'); // In case it's configured to start off as hidden submitted = true; return false; } @@ -366,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.'); @@ -421,30 +442,39 @@ function renderDetails(data, marker) { var details = '
'; if (marker) details += ''; - if (data["md-title"] != undefined) { - details += ''; - } - if (data["md-date"] != undefined) - details += ''; - if (data["md-author"] != undefined) - details += ''; - if (data["md-electronic-url"] != undefined) - details += ''; - if (data["location"][0]["md-subject"] != undefined) - details += ''; - if (data["location"][0]["@name"] != undefined) - details += ''; + + 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 += '
'+ marker + '
' + 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 += '
' + M('Date') + ': ' + data["md-date"] + '
' + M('Author') + ': ' + data["md-author"] + '
URL: ' + data["md-electronic-url"] + '' + '
' + M('Subject') + ': ' + data["location"][0]["md-subject"] + '
' + M('Location') + ': ' + data["location"][0]["@name"] + " (" +data["location"][0]["@id"] + ")" + '
'; + 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. @@ -509,7 +539,7 @@ function mkws_html_all(config) { \
\
\ - ' + M('Sort by') + mkws_html_sort(config) + '\ + ' + M('Sort by') + ' ' + mkws_html_sort(config) + '\ ' + M('and show') + ' ' + mkws_html_perpage(config) + '\ ' + M('per page') + '.\
\ @@ -612,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 */ @@ -646,13 +673,15 @@ function mkws_html_lang(mkws_config) { hash[lang_display[i]] = 1; } - if (hash[lang_default] == 1) - list.push(lang_default); - for (var k in mkws_locale_lang) { if (hash[k] == 1 || lang_display.length == 0) list.push(k); } + + // add english link + if (lang_display.length == 0 || hash[lang_default] == 1) + list.push(lang_default); + debug("Language menu for: " + list.join(", ")); /* the HTML part */ @@ -664,7 +693,7 @@ function mkws_html_lang(mkws_config) { data += ' | '; if (lang == l) { - data += l; + data += ' ' + l + ' '; } else { data += ' ' + l + ' ' } @@ -685,7 +714,7 @@ function M(word) { /* implement jQuery.parseQuerystring() for parsing URL parameters */ jQuery.extend({ - parseQuerystring: function() { + parseQuerystring: function() { var nvpair = {}; var qs = window.location.search.replace('?', ''); var pairs = qs.split('&'); @@ -694,7 +723,21 @@ jQuery.extend({ nvpair[pair[0]] = pair[1]; }); return nvpair; -} }); + }, + pazpar2: function(data) { + document.write('
\ +
\ +
\ +
\ +
\ + '); + + mkws_html_all(mkws_config); + } +}); function debug(string) { if (!mkws_debug)