X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-core.js;h=1d4d26ed32881c8ad5f69194e6eb66db31c16dc6;hb=a400ffb90ea4c58ac7505052e00484421d7a4e7b;hp=7a1054b2765697a9a360acb3979fe640b6022452;hpb=2285b25cf4008dc5e48012c4bba0d08d542ecb1c;p=mkws-moved-to-github.git

diff --git a/src/mkws-core.js b/src/mkws-core.js
index 7a1054b..1d4d26e 100644
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@ -16,6 +16,7 @@ window.mkws = {
   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: {},
@@ -90,25 +91,38 @@ if (typeof(mkws_jQuery) !== "undefined") {
   mkws.$ = jQuery;
 }
 
-mkws.log = function(string) {
-  if (!mkws.log_level)
-    return;
+mkws.logger = JL('mkws');
+var consoleAppender = JL.createConsoleAppender('consoleAppender');
+mkws.logger.setOptions({ "appenders": [consoleAppender]} );
+
 
-  if (typeof console === "undefined" || typeof console.log === "undefined") { /* ARGH!!! old IE */
+function _log(fn, string) {
+  if (!mkws.log_level)
     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
     console.trace();
   } else if (mkws.log_level >= 2) {
-    console.log(">>> called from function " + arguments.callee.caller.name + ' <<<');
+
   }
-  console.log(string);
+  fn.call(mkws.logger, string);
 };
 
 
+mkws.log = function(x) { _log(mkws.logger.debug, x) };
+/*
+trace("message with severity trace");
+debug("message with severity debug");
+info("message with severity info");
+warn("message with severity warn");
+error("message with severity error");
+fatal("message with severity fatal");
+*/
+
+
+
 // Translation function.
 mkws.M = function(word) {
   var lang = mkws.config.lang;
@@ -157,7 +171,7 @@ mkws.setMkwsConfig = function(overrides) {
     pp2_hostname: "sp-mkws.indexdata.com",
     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: "",
@@ -615,8 +629,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;