X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=10a391562e178ee1d2ce4b64a17816920ada9f7f;hb=ea2128e0b27d5832ed2c6b85f046fcb1b3e603ff;hp=c0171d90e1b33f4e0ecccefe557e58455b4c405f;hpb=11bcb1abd023be87665c4c63c2dc319460306b6a;p=mkws-moved-to-github.git diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js index c0171d9..10a3915 100644 --- a/tools/htdocs/mkws.js +++ b/tools/htdocs/mkws.js @@ -7,7 +7,7 @@ var mkws = { sort: 'relevance', authenticated: false, - filters: [], + filters: [] }; /* @@ -104,7 +104,7 @@ var debug = mkws.debug_function; // local alias Handlebars.registerHelper('json', function(obj) { - return JSON.stringify(obj); + return $.toJSON(obj); }); @@ -160,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"]], @@ -196,6 +197,8 @@ 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; @@ -218,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 } ); @@ -417,9 +420,9 @@ function onFormSubmitEventHandler() return false; } -function newSearch(query, sort) +function newSearch(query, sort, targets) { - if (!mkws.authenticated) { + if (mkws_config.use_service_proxy && !mkws.authenticated) { alert("searching before authentication"); return; } @@ -428,7 +431,7 @@ function newSearch(query, sort) redraw_navi(); resetPage(); loadSelect(); - triggerSearch(query, sort); + triggerSearch(query, sort, targets); mkws.switchView('records'); // In case it's configured to start off as hidden submitted = true; } @@ -448,7 +451,7 @@ function resetPage() totalRec = 0; } -function triggerSearch (query, sort) +function triggerSearch (query, sort, targets) { var pp2filter = ""; var pp2limit = ""; @@ -460,13 +463,22 @@ function triggerSearch (query, sort) 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 += ","; @@ -474,7 +486,7 @@ function triggerSearch (query, sort) } } - debug("triggerSearch(" + mkws.query + "): filters = " + JSON.stringify(mkws.filters) + ", pp2filter = " + pp2filter + ", pp2limit = " + 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 }); } @@ -514,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); } } @@ -539,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); } } @@ -580,7 +592,7 @@ function redraw_navi () ');return false;">' + filter.value + ''; } } - + navi.innerHTML = text; } @@ -893,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 @@ -1003,9 +1016,14 @@ function mkws_html_perpage() { * The username/password is configured in the apache config file * for the site. */ -function mkws_service_proxy_auth(auth_url, auth_domain) { +function mkws_service_proxy_auth(auth_url, auth_domain, pp2_url) { debug("Run service proxy auth URL: " + auth_url); + if (!auth_domain) { + auth_domain = pp2_url.replace(/^http:\/\/(.*?)\/.*/, '$1'); + debug("guessed auth_domain '" + auth_domain + "' from pp2_url '" + pp2_url + "'"); + } + var request = new pzHttpRequest(auth_url, function(err) { alert("HTTP call for authentication failed: " + err) return;