X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=10a391562e178ee1d2ce4b64a17816920ada9f7f;hb=ea2128e0b27d5832ed2c6b85f046fcb1b3e603ff;hp=cf7b6c6998e783f1b5e5176e1db8687e68eb8181;hpb=659e818488c11679cc7ed8ee57ebcd2368e0c58b;p=mkws-moved-to-github.git diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js index cf7b6c6..10a3915 100644 --- a/tools/htdocs/mkws.js +++ b/tools/htdocs/mkws.js @@ -5,7 +5,9 @@ // Set up namespace and some state. var mkws = { - filters: [], + sort: 'relevance', + authenticated: false, + filters: [] }; /* @@ -102,7 +104,7 @@ var debug = mkws.debug_function; // local alias Handlebars.registerHelper('json', function(obj) { - return JSON.stringify(obj); + return $.toJSON(obj); }); @@ -158,6 +160,7 @@ Handlebars.registerHelper('commaList', function(items, options) { /* default mkws config */ var config_default = { use_service_proxy: true, + pazpar2_url: "http://mkws.indexdata.com/service-proxy/", service_proxy_auth: "http://mkws.indexdata.com/service-proxy-auth", lang: "", sort_options: [["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]], @@ -191,6 +194,11 @@ Handlebars.registerHelper('commaList', function(items, options) { } } +mkws.sort = mkws_config.sort_default; +debug("copied mkws_config.sort_default '" + mkws_config.sort_default + "' to mkws.sort"); + +mkws.usesessions = mkws_config.use_service_proxy ? false : true; + if (mkws_config.query_width < 5 || mkws_config.query_width > 150) { debug("Reset query width: " + mkws_config.query_width); mkws_config.query_width = 50; @@ -213,13 +221,13 @@ for (var key in mkws_config) { // autoInit is set to true on default var my_paz = new pz2( { "onshow": my_onshow, "showtime": 500, //each timer (show, stat, term, bytarget) can be specified this way - "pazpar2path": mkws_config.pazpar2_url || "http://mkws.indexdata.com/service-proxy/", + "pazpar2path": mkws_config.pazpar2_url, "oninit": my_oninit, "onstat": my_onstat, "onterm": my_onterm, "termlist": "xtargets,subject,author", "onbytarget": my_onbytarget, - "usesessions" : mkws_config.use_service_proxy ? false : true, + "usesessions" : mkws.usesessions, "showResponseType": '', // or "json" (for debugging?) "onrecord": my_onrecord } ); @@ -231,7 +239,6 @@ var recPerPage = 20; var totalRec = 0; var curDetRecId = ''; var curDetRecData = null; -var curSort = 'relevance'; var submitted = false; var SourceMax = 16; var SubjectMax = 10; @@ -264,24 +271,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) @@ -321,7 +333,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) { @@ -403,12 +416,24 @@ function domReady () // when search button pressed function onFormSubmitEventHandler() { + newSearch(document.mkwsSearchForm.mkwsQuery.value); + return false; +} + +function newSearch(query, sort, targets) +{ + if (mkws_config.use_service_proxy && !mkws.authenticated) { + alert("searching before authentication"); + return; + } + + mkws.filters = [] + redraw_navi(); resetPage(); loadSelect(); - triggerSearch(); + triggerSearch(query, sort, targets); mkws.switchView('records'); // In case it's configured to start off as hidden submitted = true; - return false; } function onSelectDdChange() @@ -416,7 +441,7 @@ function onSelectDdChange() if (!submitted) return false; resetPage(); loadSelect(); - my_paz.show(0, recPerPage, curSort); + my_paz.show(0, recPerPage, mkws.sort); return false; } @@ -426,17 +451,34 @@ function resetPage() totalRec = 0; } -function triggerSearch () +function triggerSearch (query, sort, targets) { var pp2filter = ""; var pp2limit = ""; + // Re-use previous query/sort if new ones are not specified + if (query) { + mkws.query = query; + } + if (sort) { + mkws.sort = sort; + } + if (targets) { + // ### should support multiple |-separated targets + mkws.filters.push({ id: targets, name: targets }); + } + for (var i in mkws.filters) { var filter = mkws.filters[i]; if (filter.id) { if (pp2filter) pp2filter += ","; - pp2filter += 'pz:id=' + filter.id; + if (filter.id.match(/^[a-z:]+[=~]/)) { + debug("filter '" + filter.id + "' already begins with SETTING OP"); + } else { + filter.id = 'pz:id=' + filter.id; + } + pp2filter += filter.id; } else { if (pp2limit) pp2limit += ","; @@ -444,15 +486,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 = " + $.toJSON(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; } @@ -484,16 +526,16 @@ mkws.limitTarget = function (id, name) mkws.delimitQuery = function (field, value) { - debug("delimitQuery(field=" + field + ", value=" + value + ")"); + debug("delimitQuery(field=" + field + ", value=" + value + ")"); var newFilters = []; for (var i in mkws.filters) { var filter = mkws.filters[i]; if (filter.field && field == filter.field && value == filter.value) { - debug("delimitTarget() removing filter " + JSON.stringify(filter)); + debug("delimitTarget() removing filter " + $.toJSON(filter)); } else { - debug("delimitTarget() keeping filter " + JSON.stringify(filter)); + debug("delimitTarget() keeping filter " + $.toJSON(filter)); newFilters.push(filter); } } @@ -509,14 +551,14 @@ mkws.delimitQuery = function (field, value) mkws.delimitTarget = function (id) { - debug("delimitTarget(id=" + id + ")"); + debug("delimitTarget(id=" + id + ")"); var newFilters = []; for (var i in mkws.filters) { var filter = mkws.filters[i]; if (filter.id) { - debug("delimitTarget() removing filter " + JSON.stringify(filter)); + debug("delimitTarget() removing filter " + $.toJSON(filter)); } else { - debug("delimitTarget() keeping filter " + JSON.stringify(filter)); + debug("delimitTarget() keeping filter " + $.toJSON(filter)); newFilters.push(filter); } } @@ -550,7 +592,7 @@ function redraw_navi () ');return false;">' + filter.value + ''; } } - + navi.innerHTML = text; } @@ -777,6 +819,18 @@ function defaultTemplate(name) \ \ '; + } else if (name === "Summary") { + return '\ + \ + {{md-title}}\ + \ + {{#if md-title-remainder}}\ + {{md-title-remainder}}\ + {{/if}}\ + {{#if md-title-responsibility}}\ + {{md-title-responsibility}}\ + {{/if}}\ +'; } var s = "There is no default '" + name +"' template!"; @@ -785,60 +839,6 @@ function defaultTemplate(name) } -function defaultRenderDetails(data, marker) -{ - 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 + ""; - } - - return '' + M(caption) + '' + res + ''; -} - - /* * All the HTML stuff to render the search forms and * result pages. @@ -905,8 +905,9 @@ function mkws_html_all() { mkws_html_switch(); if (mkws_config.use_service_proxy) - mkws_service_proxy_auth(mkws_config.service_proxy_auth, - mkws_config.service_proxy_auth_domain); + mkws_service_proxy_auth(mkws_config.service_proxy_auth, + mkws_config.service_proxy_auth_domain, + mkws_config.pazpar2_url); if (mkws_config.responsive_design_width) { // Responsive web design - change layout on the fly based on @@ -929,6 +930,22 @@ 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'); + var targets = node.attr('targets'); + var s = "running auto search: '" + query + "'"; + if (sort) s += " sorted by '" + sort + "'"; + if (targets) s += " in targets '" + targets + "'"; + debug(s); + newSearch(query, sort, targets); + } +} + + function mkws_set_lang() { var lang = $.parseQuerystring().lang || mkws_config.lang; if (!lang || !mkws.locale_lang[lang]) { @@ -957,7 +974,7 @@ function mkws_html_switch() { } function mkws_html_sort() { - debug("HTML sort"); + debug("HTML sort, mkws.sort = '" + mkws.sort + "'"); var sort_html = '