X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-core.js;h=3c2ff2ae69aa815ebaf611329febda983ef7fe8c;hb=e775ddeb55acb3ead4c5e7f6e1ed0b601f91f5f4;hp=b8b06b474d90c6a0371ce52bb37f26625855bfa8;hpb=ed9584cc29f7be0e35b94faf2e9800d9400598e6;p=mkws-moved-to-github.git

diff --git a/src/mkws-core.js b/src/mkws-core.js
index b8b06b4..3c2ff2a 100644
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@ -166,7 +166,11 @@ mkws.setMkwsConfig = function(overrides) {
   var config_default = {
     use_service_proxy: true,
     pazpar2_url:        "//mkws.indexdata.com/service-proxy/",
-    service_proxy_auth: "//mkws.indexdata.com/service-proxy-auth",
+    service_proxy_auth: undefined, // generally rolled from the next three properties
+    // Was: //mkws.indexdata.com/service-proxy-auth
+    pp2_hostname: "mkws.indexdata.com",
+    sp_path: "service-proxy-auth",
+    credentials: undefined,
     lang: "",
     sort_options: [["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]],
     perpage_options: [10, 20, 30, 50],
@@ -386,7 +390,7 @@ mkws.pagerNext = function(tname) {
       // autosearch on the team or the team has otherwise gotten a query
       if (node.hasAttribute("autosearch")) {
         if (mkws.autoHasAuto ||
-            mkws.teams["AUTO"] && mkws.teams["AUTO"].config()["query"]) {
+            mkws.teams["AUTO"] && mkws.teams["AUTO"].config["query"]) {
           log("AUTO team already has a query, using unique team");
           teamName = "UNIQUE";
         }
@@ -623,8 +627,28 @@ mkws.pagerNext = function(tname) {
       }
     */
 
+    function sp_auth_url(config) {
+      if (config.service_proxy_auth) {
+        mkws.log("using pre-baked sp_auth_url '" + config.service_proxy_auth + "'");
+        return config.service_proxy_auth;
+      } else {
+        var s = '//';
+        s += config.auth_hostname ? config.auth_hostname : config.pp2_hostname;
+        s += '/' + config.sp_path + '?command=auth&action=perconfig';
+        var c = config.credentials;
+        if (c) {
+          if (c) {
+            s += ('&username=' + c.substr(0, c.indexOf('/')) +
+                  '&password=' + c.substr(c.indexOf('/')+1));
+          }
+        }
+        mkws.log("generated sp_auth_url '" + s + "'");
+        return s;
+      }
+    }
+
     if (mkws.config.use_service_proxy) {
-      authenticateSession(mkws.config.service_proxy_auth,
+      authenticateSession(sp_auth_url(mkws.config),
                           mkws.config.service_proxy_auth_domain,
                           mkws.config.pazpar2_url);
     } else {