X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2Fmkws.js;h=cb3e9738eb8f357c61163d810a3595319adf5033;hb=300831588b9d63572ea780444f3d38a455255302;hp=658f8499c414c8546fde6cefc161cbf74bfa2afb;hpb=4fcef8ebfa3efd25d3d461aeffefe774f940b6a8;p=mkws-moved-to-github.git diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js index 658f849..cb3e973 100644 --- a/tools/htdocs/mkws.js +++ b/tools/htdocs/mkws.js @@ -1,5 +1,4 @@ -/* A very simple client that shows a basic usage of the pz2.js -*/ +/* MKWS, the MasterKey Widget Set. Copyright (C) 2013, Index Data */ "use strict"; // HTML5: disable for debug_level >= 2 @@ -422,7 +421,9 @@ function onFormSubmitEventHandler() function newSearch(query, sort, targets) { - if (!mkws.authenticated) { + debug("newSearch: " + query); + + if (mkws_config.use_service_proxy && !mkws.authenticated) { alert("searching before authentication"); return; } @@ -904,10 +905,14 @@ function mkws_html_all() { mkws_html_switch(); - if (mkws_config.use_service_proxy) + if (mkws_config.use_service_proxy) { mkws_service_proxy_auth(mkws_config.service_proxy_auth, mkws_config.service_proxy_auth_domain, mkws_config.pazpar2_url); + } else { + // raw pp2 + run_auto_searches(); + } if (mkws_config.responsive_design_width) { // Responsive web design - change layout on the fly based on @@ -932,6 +937,8 @@ function mkws_html_all() { function run_auto_searches() { + debug("run auto searches"); + var node = $('#mkwsRecords'); if (node.attr('autosearch')) { var query = node.attr('autosearch');