From: Mike Taylor <mike@indexdata.com>
Date: Tue, 9 Sep 2014 12:44:03 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 1.0.0~324^2~26^2~8
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=4898fb8bfe605439a94a7663c98c663d49c24c79;hp=052a276af4fff072eb9466b64f290f538c4f5496;p=mkws-moved-to-github.git

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

diff --git a/examples/htdocs/mike.html b/examples/htdocs/mike.html
index 5d794a0..198cc44 100644
--- a/examples/htdocs/mike.html
+++ b/examples/htdocs/mike.html
@@ -7,12 +7,10 @@
       var mkws_config = {
         // For now, we have to provide known-bad credentials to skip user/pw login: see bug MKSP-125
         // Was: //sp-mkws.indexdata.com/service-proxy/?command=auth&action=perconfig&username=XXX&password=XXX
-        pp2_hostname: "x.sp-mkws.indexdata.com",
-        sp_path: "service-proxy/",
-        sp_auth_query: "command=auth&action=perconfig",
-        sp_auth_credentials: "XXX/XXX",
-        // ### This should automatically follow pp2_hostname
-	pazpar2_url:        "//x.sp-mkws.indexdata.com/service-proxy/",
+//        pp2_hostname: "sp-mkws.indexdata.com",
+//        sp_auth_path: "service-proxy/",
+//        sp_auth_query: "command=auth&action=perconfig",
+//        sp_auth_credentials: "XXX/XXX",
       };
     </script>
     <script type="text/javascript" src="tools/htdocs/jquery-1.10.0.min.js"></script>
diff --git a/src/mkws-core.js b/src/mkws-core.js
index abe414d..28f095c 100644
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@ -167,11 +167,11 @@ mkws.setMkwsConfig = function(overrides) {
 
   var config_default = {
     use_service_proxy: true,
-    pazpar2_url:        "//mkws.indexdata.com/service-proxy/",
-    service_proxy_auth: undefined, // generally rolled from the next three properties
-    // Was: //mkws.indexdata.com/service-proxy-auth
+    pazpar2_url: undefined,
     pp2_hostname: "mkws.indexdata.com",
-    sp_path: "service-proxy-auth",
+    pp2_path: "service-proxy",
+    service_proxy_auth: undefined,
+    sp_auth_path: "service-proxy-auth",
     sp_auth_query: undefined, // Will be: "command=auth&action=perconfig",
     sp_auth_credentials: undefined,
     lang: "",
@@ -360,7 +360,14 @@ mkws.pagerNext = function(tname) {
 
 
 mkws.pazpar2_url = function() {
-  return mkws.config.pazpar2_url;
+  if (mkws.config.pazpar2_url) {
+    mkws.log("using pre-baked pazpar2_url '" + mkws.config.pazpar2_url + "'");
+    return mkws.config.pazpar2_url;
+  } else {
+    var s = document.location.protocol + "//" + mkws.config.pp2_hostname + "/" + mkws.config.pp2_path + "/";
+    mkws.log("generated pazpar2_url '" + s + "'");
+    return s;
+  }
 };
 
 
@@ -640,7 +647,7 @@ mkws.pazpar2_url = function() {
       }
 
       // protocol independent link for pazpar2: "//mkws/sp" -> "https://mkws/sp"
-      if (mkws.config.pazpar2_url.match(/^\/\//)) {
+      if (mkws.pazpar2_url().match(/^\/\//)) {
         mkws.config.pazpar2_url = document.location.protocol + mkws.config.pazpar2_url;
         log("adjusted protocol independent link to " + mkws.pazpar2_url());
       }
@@ -681,7 +688,7 @@ mkws.pazpar2_url = function() {
       } else {
 	var s = '//';
 	s += config.auth_hostname ? config.auth_hostname : config.pp2_hostname;
-	s += '/' + config.sp_path;
+	s += '/' + config.sp_auth_path;
         var q = config.sp_auth_query;
         if (q) {
           s += '?' + q;