Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws

diff --combined tools/htdocs/mkws.js
index 6c07d2d,df75dd6..8ebdb0b
--- 1/tools/htdocs/mkws.js
--- 2/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@@ -7,7 -7,7 +7,7 @@@
  var mkws = {
      sort: 'relevance',
      authenticated: false,
-     filters: [],
+     filters: []
  };
  
  /*
@@@ -160,7 -160,6 +160,7 @@@ Handlebars.registerHelper('commaList', 
      /* 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"]],
@@@ -197,6 -196,7 +197,6 @@@
  mkws.sort = mkws_config.sort_default;
  debug("copied mkws_config.sort_default '" + mkws_config.sort_default + "' to mkws.sort");
  
 -mkws.pazpar2path = mkws_config.pazpar2_url || "http://mkws.indexdata.com/service-proxy/";
  mkws.usesessions = mkws_config.use_service_proxy ? false : true;
  
  if (mkws_config.query_width < 5 || mkws_config.query_width > 150) {
@@@ -221,7 -221,7 +221,7 @@@ 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.pazpar2path,
 +                    "pazpar2path": mkws_config.pazpar2_url,
                      "oninit": my_oninit,
                      "onstat": my_onstat,
                      "onterm": my_onterm,