authenticated: false,
authenticating: false,
active: false,
+ logger: undefined,
log_level: 1, // Will be overridden from mkws.config, but
// initial value allows jQuery popup to use logging.
teams: {},
mkws.$ = jQuery;
}
+mkws.logger = JL('mkws');
+var consoleAppender = JL.createConsoleAppender('consoleAppender');
+mkws.logger.setOptions({ "appenders": [consoleAppender]} );
+
+
mkws.log = function(string) {
if (!mkws.log_level)
return;
- if (typeof console === "undefined" || typeof console.log === "undefined") { /* ARGH!!! old IE */
- return;
- }
-
// you need to disable use strict at the top of the file!!!
if (mkws.log_level >= 3) {
// Works in Chrome; not sure about elsewhere
} else if (mkws.log_level >= 2) {
console.log(">>> called from function " + arguments.callee.caller.name + ' <<<');
}
- console.log(string);
+ mkws.logger.info(string);
};
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: "",
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;
}
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;