From 3158c719294b38a588571b6a67832bfef2921cf6 Mon Sep 17 00:00:00 2001 From: Mike Taylor Date: Mon, 11 Aug 2014 10:20:59 +0100 Subject: [PATCH] Undo inadvertent previous commit -- should have been on "mike" --- src/mkws-core.js | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/src/mkws-core.js b/src/mkws-core.js index 3c2ff2a..a3a1ac9 100644 --- a/src/mkws-core.js +++ b/src/mkws-core.js @@ -166,11 +166,7 @@ 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 - pp2_hostname: "mkws.indexdata.com", - sp_path: "service-proxy-auth", - credentials: undefined, + service_proxy_auth: "//mkws.indexdata.com/service-proxy-auth", lang: "", sort_options: [["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]], perpage_options: [10, 20, 30, 50], @@ -627,28 +623,8 @@ 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(sp_auth_url(mkws.config), + authenticateSession(mkws.config.service_proxy_auth, mkws.config.service_proxy_auth_domain, mkws.config.pazpar2_url); } else { -- 1.7.10.4