X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=1a80b106afd260b04d9c73df5e9c616306b75344;hb=1164a77a52550a7a69d432c3a8b27af43aff44a3;hp=48ec152942d3c7ebaec408f1784954ff9294b670;hpb=7fab2caaa33c53ab0b61c325e9c682494644d470;p=mkws-moved-to-github.git diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js index 48ec152..1a80b10 100644 --- a/tools/htdocs/mkws.js +++ b/tools/htdocs/mkws.js @@ -5,6 +5,8 @@ // Set up namespace and some state. var mkws = { + sort: 'relevance', + authenticated: false, filters: [], }; @@ -101,18 +103,58 @@ mkws.debug_function = function (string) { var debug = mkws.debug_function; // local alias -Handlebars.registerHelper('link', function(a) { - var result = ""; - for (var i in a) { - if (i > 0) result += "
"; - var text = Handlebars.Utils.escapeExpression(a[i]); - result += '' + text + ''; +Handlebars.registerHelper('json', function(obj) { + return JSON.stringify(obj); +}); + + +// We need {{attr '@name'}} because Handlebars can't parse {{@name}} +Handlebars.registerHelper('attr', function(attrName) { + return this[attrName]; +}); + + +/* + * Use as follows: {{#if-any NAME1 having="NAME2"}} + * Applicable when NAME1 is the name of an array + * The guarded code runs only if at least one element of the NAME1 + * array has a subelement called NAME2. + */ +Handlebars.registerHelper('if-any', function(items, options) { + var having = options.hash.having; + for (var i in items) { + var item = items[i] + if (!having || item[having]) { + return options.fn(this); + } } + return ""; +}); - return new Handlebars.SafeString(result); + +Handlebars.registerHelper('first', function(items, options) { + var having = options.hash.having; + for (var i in items) { + var item = items[i] + if (!having || item[having]) { + return options.fn(item); + } + } + return ""; }); +Handlebars.registerHelper('commaList', function(items, options) { + var out = ""; + + for (var i in items) { + if (i > 0) out += ", "; + out += options.fn(items[i]) + } + + return out; +}); + { /* default mkws config */ @@ -191,7 +233,6 @@ var recPerPage = 20; var totalRec = 0; var curDetRecId = ''; var curDetRecData = null; -var curSort = 'relevance'; var submitted = false; var SourceMax = 16; var SubjectMax = 10; @@ -224,24 +265,29 @@ 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('
', + renderSummary(hit), + '
'); + if (hit.recid == curDetRecId) { html.push(renderDetails(curDetRecData)); - } - html.push('
'); + } } replaceHtml(results, html.join('')); } + +function renderSummary(hit) +{ + if (mkws.templateSummary === undefined) { + loadTemplate("Summary"); + } + + hit._id = "mkwsRec_" + hit.recid; + hit._onclick = "mkws.showDetails(this.id);return false;" + return mkws.templateSummary(hit); +} + + function my_onstat(data) { var stat = document.getElementById("mkwsStat"); if (stat == null) @@ -281,7 +327,8 @@ function my_onterm(data) { } var termlist = document.getElementById("mkwsTermlists"); - replaceHtml(termlist, acc.join('')); + if (termlist) + replaceHtml(termlist, acc.join('')); } function add_single_facet(acc, caption, data, max, pzIndex) { @@ -363,12 +410,24 @@ function domReady () // when search button pressed function onFormSubmitEventHandler() { + newSearch(document.mkwsSearchForm.mkwsQuery.value); + return false; +} + +function newSearch(query) +{ + if (!mkws.authenticated) { + alert("searching before authentication"); + return; + } + + mkws.filters = [] + redraw_navi(); resetPage(); loadSelect(); - triggerSearch(); + triggerSearch(query); mkws.switchView('records'); // In case it's configured to start off as hidden submitted = true; - return false; } function onSelectDdChange() @@ -376,7 +435,7 @@ function onSelectDdChange() if (!submitted) return false; resetPage(); loadSelect(); - my_paz.show(0, recPerPage, curSort); + my_paz.show(0, recPerPage, mkws.sort); return false; } @@ -386,11 +445,16 @@ function resetPage() totalRec = 0; } -function triggerSearch () +function triggerSearch (query) { var pp2filter = ""; var pp2limit = ""; + // Re-use previous query if a new one is not specified + if (query) { + mkws.query = query; + } + for (var i in mkws.filters) { var filter = mkws.filters[i]; if (filter.id) { @@ -404,15 +468,15 @@ function triggerSearch () } } - debug("triggerSearch: filters = " + JSON.stringify(mkws.filters) + ", pp2filter = " + pp2filter + ", pp2limit = " + pp2limit); - my_paz.search(document.mkwsSearchForm.mkwsQuery.value, recPerPage, curSort, pp2filter, undefined, { limit: pp2limit }); + debug("triggerSearch(" + mkws.query + "): filters = " + JSON.stringify(mkws.filters) + ", pp2filter = " + pp2filter + ", pp2limit = " + pp2limit); + my_paz.search(mkws.query, recPerPage, mkws.sort, pp2filter, undefined, { limit: pp2limit }); } function loadSelect () { if (document.mkwsSelect) { if (document.mkwsSelect.mkwsSort) - curSort = document.mkwsSelect.mkwsSort.value; + mkws.sort = document.mkwsSelect.mkwsSort.value; if (document.mkwsSelect.mkwsPerpage) recPerPage = document.mkwsSelect.mkwsPerpage.value; } @@ -655,29 +719,20 @@ function replaceHtml(el, html) { function renderDetails(data, marker) { if (mkws.templateRecord === undefined) { - maybeLoadTemplate("Record"); - } - - var details; - if (mkws.templateRecord) { - var template = mkws.templateRecord; - details = template(data); - } else { - details = defaultRenderDetails(data, marker); + loadTemplate("Record"); } + var template = mkws.templateRecord; + var details = template(data); return '
' + details + '
'; } -function maybeLoadTemplate(name) +function loadTemplate(name) { var source = $("#mkwsTemplate" + name).html(); if (!source) { - debug("no template '" + name + "': falling back to default behaviour"); - // Mark template as not provided - mkws['template' + name] = 0; - return; + source = defaultTemplate(name); } var template = Handlebars.compile(source); @@ -686,57 +741,83 @@ function maybeLoadTemplate(name) } -function defaultRenderDetails(data, marker) +function defaultTemplate(name) { - var details = ''; - if (marker) details += ''; - - 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 += ''; - } else { - details += renderField("Location" + (locations.length == 1 ? "" : "s"), locations); - } - details += '
'+ marker + '
No locations for record!
'; - 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 + ""; + if (name === 'Record') { + return '\ + \ + \ + \ + \ + \ + {{#if md-date}}\ + \ + \ + \ + \ + {{/if}}\ + {{#if md-author}}\ + \ + \ + \ + \ + {{/if}}\ + {{#if md-electronic-url}}\ + \ + \ + \ + \ + {{/if}}\ + {{#if-any location having="md-subject"}}\ + \ + \ + \ + \ + {{/if-any}}\ + \ + \ + \ + \ +
Title\ + {{md-title}}\ + {{#if md-title-remainder}}\ + ({{md-title-remainder}})\ + {{/if}}\ + {{#if md-title-responsibility}}\ + {{md-title-responsibility}}\ + {{/if}}\ +
Date{{md-date}}
Author{{md-author}}
URL\ + {{#each md-electronic-url}}\ + {{this}}
\ + {{/each}}\ +
Subject\ + {{#first location having="md-subject"}}\ + {{#if md-subject}}\ + {{md-subject}}\ + {{/if}}\ + {{/first}}\ +
Locations\ + {{#commaList location}}\ + {{attr "@name"}}{{/commaList}}\ +
\ +'; + } else if (name === "Summary") { + return '\ + \ + {{md-title}}\ + \ + {{#if md-title-remainder}}\ + {{md-title-remainder}}\ + {{/if}}\ + {{#if md-title-responsibility}}\ + {{md-title-responsibility}}\ + {{/if}}\ +'; } - return '' + M(caption) + '' + res + ''; + var s = "There is no default '" + name +"' template!"; + alert(s); + return s; } @@ -830,6 +911,19 @@ function mkws_html_all() { } } + +function run_auto_searches() { + var node = $('#mkwsRecords'); + if (node.attr('autosearch')) { + var query = node.attr('autosearch'); + var sort = node.attr('sort'); + debug("running auto search: '" + query + "' sorted by '" + sort + "'"); + // ### currently ignoring sort + newSearch(query); + } +} + + function mkws_set_lang() { var lang = $.parseQuerystring().lang || mkws_config.lang; if (!lang || !mkws.locale_lang[lang]) { @@ -920,7 +1014,8 @@ function mkws_service_proxy_auth(auth_url, auth_domain) { } debug("Service proxy auth successfully done"); - mkws.service_proxy_auth = true; + mkws.authenticated = true; + run_auto_searches(); }); }