X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-core.js;h=c331bc4ba8e225edddf76b79f87f20c4c5a70bd8;hb=1dfb625168e68050741445453bc5f1c84819c040;hp=1557d160d5fb9417b904a93b03b094cefc88d312;hpb=5ee0a802f5f190e3dfeb89d3e2eb624f6191941a;p=mkws-moved-to-github.git diff --git a/src/mkws-core.js b/src/mkws-core.js index 1557d16..c331bc4 100644 --- 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", - pp2_path: "service-proxy", + pp2_path: "service-proxy/", 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: "", @@ -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 { - 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; } @@ -615,8 +615,9 @@ mkws.log("Using window.name '" + window.name + "'"); 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;