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

diff --git a/examples/htdocs/localauth.html b/examples/htdocs/localauth.html
index 867d6ea..6c7e811 100644 (file)
--- a/examples/htdocs/localauth.html
+++ b/examples/htdocs/localauth.html
@@ -5,7 +5,6 @@
     <link rel="stylesheet" type="text/css" href="http://mkws.indexdata.com/mkws.css" />
     <script type="text/javascript">
       var mkws_config = {
-        pazpar2_url: "http://mkws.indexdata.com/service-proxy/",
         service_proxy_auth: "http://example.indexdata.com/service-proxy-auth/",
         service_proxy_auth_domain : "mkws.indexdata.com"
       };

diff --git a/examples/htdocs/mike.html b/examples/htdocs/mike.html
index 91793ea..94e700f 100644 (file)
--- a/examples/htdocs/mike.html
+++ b/examples/htdocs/mike.html
@@ -5,10 +5,11 @@
     <link rel="stylesheet" type="text/css" href="http://mkws.indexdata.com/mkws.css" />
     <script type="text/javascript">
       var mkws_config = {
-        pazpar2_url: "http://mkws.indexdata.com/service-proxy/",
         service_proxy_auth: "http://x.example.indexdata.com/service-proxy-auth/",
         service_proxy_auth_domain : "mkws.indexdata.com"
       };
+      // See also the Apache2 RewriteRule needed to make this work:
+      // http://example.indexdata.com/apache-config.txt
     </script>
     <script type="text/javascript" src="http://x.mkws.indexdata.com/mkws-complete.js"></script>
   </head>

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index df75dd6..8ebdb0b 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -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,7 +197,6 @@ 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.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 @@ 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,