projects
/
mkws-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
auth_hostname configuration setting renamed sp_auth_hostname
[mkws-moved-to-github.git]
/
src
/
mkws-core.js
diff --git
a/src/mkws-core.js
b/src/mkws-core.js
index
1557d16
..
c331bc4
100644
(file)
--- a/
src/mkws-core.js
+++ b/
src/mkws-core.js
@@
-155,9
+155,9
@@
mkws.setMkwsConfig = function(overrides) {
use_service_proxy: true,
pazpar2_url: undefined,
pp2_hostname: "sp-mkws.indexdata.com",
use_service_proxy: true,
pazpar2_url: undefined,
pp2_hostname: "sp-mkws.indexdata.com",
- pp2_path: "service-proxy",
+ pp2_path: "service-proxy/",
service_proxy_auth: undefined,
service_proxy_auth: undefined,
- sp_auth_path: "service-proxy/",
+ sp_auth_path: undefined,
sp_auth_query: "command=auth&action=perconfig",
sp_auth_credentials: undefined,
lang: "",
sp_auth_query: "command=auth&action=perconfig",
sp_auth_credentials: undefined,
lang: "",
@@
-246,7
+246,7
@@
mkws.pazpar2_url = function() {
mkws.log("using pre-baked pazpar2_url '" + mkws.config.pazpar2_url + "'");
return mkws.config.pazpar2_url;
} else {
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 + "/";
+ var s = document.location.protocol + "//" + mkws.config.pp2_hostname + "/" + mkws.config.pp2_path;
mkws.log("generated pazpar2_url '" + s + "'");
return s;
}
mkws.log("generated pazpar2_url '" + s + "'");
return s;
}
@@
-615,8
+615,9
@@
mkws.log("Using window.name '" + window.name + "'");
return config.service_proxy_auth;
} else {
var s = '//';
return config.service_proxy_auth;
} else {
var s = '//';
- s += config.auth_hostname ? config.auth_hostname : config.pp2_hostname;
- s += '/' + config.sp_auth_path;
+ s += config.sp_auth_hostname ? config.sp_auth_hostname : config.pp2_hostname;
+ s += '/';
+ s += config.sp_auth_path ? config.sp_auth_path : config.pp2_path;
var q = config.sp_auth_query;
if (q) {
s += '?' + q;
var q = config.sp_auth_query;
if (q) {
s += '?' + q;