X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=src%2Fmkws-core.js;h=2b258073e28781efebf914a04e91f18a10cf3f99;hp=fb372e8f9ecc54d52107c421eb36d56f99a65ad2;hb=7b6b1d731e85c96c95101e444364eca4ab03782c;hpb=c6ec9ed865103f833479ecd767f2803b34cb6b1b

diff --git a/src/mkws-core.js b/src/mkws-core.js
index fb372e8..2b25807 100644
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@ -3,7 +3,7 @@
  *  See the file LICENSE for details
  */
 
-"use strict"; // HTML5: disable for log_level >= 2
+"use strict";
 
 
 // Set up global mkws object. Contains truly global state such as SP
@@ -17,8 +17,7 @@ window.mkws = {
   authenticating: false,
   active: false,
   logger: undefined,
-  log_level: 1, // Will be overridden from mkws.config, but
-                // initial value allows jQuery popup to use logging.
+  log_level: "info",
   teams: {},
   widgetType2function: {},
   defaultTemplates: {},
@@ -91,9 +90,29 @@ if (typeof(mkws_jQuery) !== "undefined") {
   mkws.$ = jQuery;
 }
 
+// It's ridiculous that JSNLog doesn't provide this
+mkws.stringToLevel = function(s) {
+  if (s === 'trace') {
+    return JL.getTraceLevel();
+  } else if (s === 'debug') {
+    return JL.getDebugLevel();
+  } else if (s === 'info') {
+    return JL.getInfoLevel();
+  } else if (s === 'warn') {
+    return JL.getWarnLevel();
+  } else if (s === 'error') {
+    return JL.getErrorLevel();
+  } else if (s === 'fatal') {
+    return JL.getFatalLevel();
+  } else {
+    throw "bad log-level '" + s + "'";
+  }
+}
+
 mkws.logger = JL('mkws');
 var consoleAppender = JL.createConsoleAppender('consoleAppender');
-mkws.logger.setOptions({ "appenders": [consoleAppender]} );
+mkws.logger.setOptions({ "appenders": [consoleAppender],
+                         "level": mkws.stringToLevel(mkws.log_level) });
 
 
 function _log(fn, string) {
@@ -111,9 +130,6 @@ function _log(fn, string) {
 };
 
 
-// ### transitional placeholder function until we have promoted all invocations
-mkws.log = function(x) { _log(mkws.logger.debug, "LEGACY LOG: " + x) };
-
 mkws.trace = function(x) { _log(mkws.logger.trace, x) };
 mkws.debug = function(x) { _log(mkws.logger.debug, x) };
 mkws.info = function(x) { _log(mkws.logger.info, x) };
@@ -146,7 +162,7 @@ mkws.getParameterByName = function(name, url) {
 
 mkws.registerWidgetType = function(name, fn) {
   if(mkws._old2new.hasOwnProperty(name)) {
-      mkws.warn("Warning: registerWidgetType old widget name: " + name + " => " + mkws._old2new[name]);
+      mkws.warn("registerWidgetType old widget name: " + name + " => " + mkws._old2new[name]);
       name = mkws._old2new[name];
   }
 
@@ -518,7 +534,7 @@ mkws.info("Using window.name '" + window.name + "'");
         myTeam.addWidget(myWidget);
         var newHTML = this.innerHTML;
         if (newHTML !== oldHTML) {
-          myTeam.log("widget " + type + " HTML changed: reparsing");
+          myTeam.info("widget " + type + " HTML changed: reparsing");
           makeWidgetsWithin(level+1, $(this));
         }
       });
@@ -543,7 +559,7 @@ mkws.info("Using window.name '" + window.name + "'");
     var greet = "MKWS initialised";
     if (rootsel) greet += " (limited to " + rootsel + ")"
     if (message) greet += " :: " + message; 
-    mkws.warn(greet);
+    mkws.info(greet);
 
     // MKWS is not active until init() has been run against an object with widget nodes.
     // We only set initial configuration when MKWS is first activated.
@@ -613,7 +629,7 @@ mkws.info("Using window.name '" + window.name + "'");
     for (var tName in mkws.teams) {
       var myTeam = mkws.teams[tName]
       myTeam.makePz2();
-      myTeam.log("made PZ2 object");
+      myTeam.info("made PZ2 object");
       /*
         myTeam.visitWidgets(function(t, w) {
           mkws.debug("  has widget of type '" + t + "': " + w);