X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=d331de50b0484558f3cf88166e5697739fa10372;hb=1cb6ac748b3e920577baacfdd39d0373ea6767e1;hp=463508332950458a6ddf2c78e42d1dc2d13bdcaa;hpb=6708282c8f7db0350dd63846954a35b77bb9b317;p=mkws-moved-to-github.git diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js index 4635083..d331de5 100644 --- a/tools/htdocs/mkws.js +++ b/tools/htdocs/mkws.js @@ -5,6 +5,7 @@ // Set up namespace and some state. var mkws = { + sort: 'relevance', authenticated: false, filters: [], }; @@ -192,6 +193,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; @@ -214,13 +220,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 || "http://mkws.indexdata.com/service-proxy/", "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 } ); @@ -232,7 +238,6 @@ var recPerPage = 20; var totalRec = 0; var curDetRecId = ''; var curDetRecData = null; -var curSort = 'relevance'; var submitted = false; var SourceMax = 16; var SubjectMax = 10; @@ -414,7 +419,7 @@ function onFormSubmitEventHandler() return false; } -function newSearch(query) +function newSearch(query, sort, targets) { if (!mkws.authenticated) { alert("searching before authentication"); @@ -425,7 +430,7 @@ function newSearch(query) redraw_navi(); resetPage(); loadSelect(); - triggerSearch(query); + triggerSearch(query, sort, targets); mkws.switchView('records'); // In case it's configured to start off as hidden submitted = true; } @@ -435,7 +440,7 @@ function onSelectDdChange() if (!submitted) return false; resetPage(); loadSelect(); - my_paz.show(0, recPerPage, curSort); + my_paz.show(0, recPerPage, mkws.sort); return false; } @@ -445,22 +450,34 @@ function resetPage() totalRec = 0; } -function triggerSearch (query) +function triggerSearch (query, sort, targets) { var pp2filter = ""; var pp2limit = ""; - // Re-use previous query if a new one is not specified + // 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 += ","; @@ -469,14 +486,14 @@ function triggerSearch (query) } debug("triggerSearch(" + mkws.query + "): filters = " + JSON.stringify(mkws.filters) + ", pp2filter = " + pp2filter + ", pp2limit = " + pp2limit); - my_paz.search(mkws.query, recPerPage, curSort, pp2filter, undefined, { limit: 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; } @@ -508,7 +525,7 @@ 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]; @@ -533,7 +550,7 @@ 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]; @@ -574,7 +591,7 @@ function redraw_navi () ');return false;">' + filter.value + ''; } } - + navi.innerHTML = text; } @@ -887,7 +904,7 @@ 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) { @@ -917,9 +934,12 @@ function run_auto_searches() { 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); + 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); } } @@ -952,7 +972,7 @@ function mkws_html_switch() { } function mkws_html_sort() { - debug("HTML sort"); + debug("HTML sort, mkws.sort = '" + mkws.sort + "'"); var sort_html = '