From: Mike Taylor <mike@indexdata.com>
Date: Thu, 21 Nov 2013 13:47:52 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 0.9.1~148^2~65
X-Git-Url: http://jsfdemo.indexdata.com/?a=commitdiff_plain;h=c3390fc0d2188fda0e382a3ee8eca39de2be0a2c;hp=d6ff4d136832a719d8e9357369f457e1ece9cf7c;p=mkws-moved-to-github.git

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

diff --git a/examples/htdocs/jakub.html b/examples/htdocs/jakub.html
index 9433603..6a06b22 100644
--- a/examples/htdocs/jakub.html
+++ b/examples/htdocs/jakub.html
@@ -6,7 +6,8 @@
     <script type="text/javascript">
       var mkws_config = {
         pazpar2_url: "http://mkws-origin/service-proxy/",
-        service_proxy_auth: "http://mkws-origin/service-proxy-auth/"
+        service_proxy_auth: "http://mkws-local/service-proxy-auth/",
+        service_proxy_auth_domain : "mkws-origin"
       };
     </script>
     <script type="text/javascript" src="http://mkws-origin/mkws-complete.js"></script>
diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 3676a51..ee13dba 100644
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -675,7 +675,8 @@ function mkws_html_all() {
     mkws_html_switch();
 
     if (mkws_config.use_service_proxy)
-	mkws_service_proxy_auth(mkws_config.service_proxy_auth);
+	  mkws_service_proxy_auth(mkws_config.service_proxy_auth, 
+          mkws_config.service_proxy_auth_domain);
 
     if (mkws_config.responsive_design_width) {
 	// Responsive web design - change layout on the fly based on
@@ -768,13 +769,13 @@ function mkws_html_perpage() {
  * The username/password is configured in the apache config file
  * for the site.
  */
-function mkws_service_proxy_auth(auth_url) {
+function mkws_service_proxy_auth(auth_url, auth_domain) {
     debug("Run service proxy auth URL: " + auth_url);
 
     var request = new pzHttpRequest(auth_url, function(err) {
-	alert("HTTP call for authentication failed: " + err)
-	return;
-    });
+	  alert("HTTP call for authentication failed: " + err)
+	  return;
+    }, auth_domain);
 
     request.get(null, function(data) {
 	if (!$.isXMLDoc(data)) {