[open-ils-commits] r19323 - in trunk/Open-ILS/xul/staff_client: chrome/content/OpenILS server/OpenILS (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2011-01-28 14:38:57 -0500 (Fri, 28 Jan 2011)
New Revision: 19323

Modified:
   trunk/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul
   trunk/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_offline.xul
   trunk/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
Log:
Replace the native dump() function with a wrapper function that takes an optional 2nd parameter for log level (defaults to debug)
Log level: 0 None, 1 Error, 2 Warning, 3 Info, 4 debug
A global _dump_level variable gets consulted when the function is used.  The default is 2, Warning.
So by default, until we start changing things, this will suppress most of the existing dump statements.  Some are slipping through the cracks based on when the function replacement happens, but I'm happy with it.  We also prepend the dump msg with a label for the log level.

_dump_level could be locally customized with server/skin/custom.js


Modified: trunk/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul	2011-01-28 19:38:06 UTC (rev 19322)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul	2011-01-28 19:38:57 UTC (rev 19323)
@@ -2,8 +2,31 @@
 <overlay id="openils_util_overlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
+    <script>dump('Loading OpenILS/util_overlay_chrome.xul for ' + location.href + '\n');</script>
     <scripts id="openils_util_scripts">
-        <script>dump('starting openils_util_overlay\n');</script>
+        <script>
+        <![CDATA[
+        var _dump_level = 2; // 0 None, 1 Error, 2 Warning, 3 Info, 4 debug
+        if (!_original_dump) {
+            var _original_dump = window.dump;
+            window.dump = function (msg,level) {
+                try {
+                    if (typeof level == 'undefined') { level = 4; }
+                    if (level > _dump_level) { return; }
+                    switch(level) {
+                        case 1: case 'error': _original_dump('error: '); break;
+                        case 2: case 'warn': _original_dump('warn: '); break;
+                        case 3: case 'info': _original_dump('info: '); break;
+                        case 4: case 'debug': _original_dump('debug: '); break;
+                    }
+                    _original_dump(msg);
+                } catch(E) {
+                    alert('error in dump: ' + E + '\nmsg = ' + msg + '\nlevel = ' + level + '\n');
+                }
+            };
+        }
+        ]]>
+        </script>
         <script type="text/javascript" src="../main/constants.js" />
         <script type="text/javascript" src="util/utils.js" />
         <script type="text/javascript" src="util/CGI.js" />

Modified: trunk/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_offline.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_offline.xul	2011-01-28 19:38:06 UTC (rev 19322)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_offline.xul	2011-01-28 19:38:57 UTC (rev 19323)
@@ -4,7 +4,30 @@
 <overlay id="openils_util_overlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-    <script>dump('Loading OpenILS/util_overlay_offline.xul\n');</script>
+    <script>dump('Loading OpenILS/util_overlay_offline.xul for ' + location.href + '\n');</script>
+    <script>
+    <![CDATA[
+    var _dump_level = 2; // 0 None, 1 Error, 2 Warning, 3 Info, 4 debug
+    if (!_original_dump) {
+        var _original_dump = window.dump;
+        window.dump = function (msg,level) {
+            try {
+                if (typeof level == 'undefined') { level = 4; }
+                if (level > _dump_level) { return; }
+                switch(level) {
+                    case 1: case 'error': _original_dump('error: '); break;
+                    case 2: case 'warn': _original_dump('warn: '); break;
+                    case 3: case 'info': _original_dump('info: '); break;
+                    case 4: case 'debug': _original_dump('debug: '); break;
+                }
+                _original_dump(msg);
+            } catch(E) {
+                alert('error in dump: ' + E + '\nmsg = ' + msg + '\nlevel = ' + level + '\n');
+            }
+        };
+    }
+    ]]>
+    </script>
     <scripts id="openils_util_scripts">
         <script type="text/javascript" src="../main/constants.js" />
         <script type="text/javascript" src="util/utils.js" />

Modified: trunk/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul	2011-01-28 19:38:06 UTC (rev 19322)
+++ trunk/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul	2011-01-28 19:38:57 UTC (rev 19323)
@@ -5,8 +5,31 @@
 <overlay id="openils_util_overlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
+    <script>dump('Loading OpenILS/util_overlay.xul for ' + location.href + '\n');</script>
     <scripts id="openils_util_scripts">
-        <script>dump('starting openils_util_overlay in ' + location.href + '\n');</script>
+        <script>
+        <![CDATA[
+        var _dump_level = 2; // 0 None, 1 Error, 2 Warning, 3 Info, 4 debug
+        if (!_original_dump) {
+            var _original_dump = window.dump;
+            window.dump = function (msg,level) {
+                try {
+                    if (typeof level == 'undefined') { level = 4; }
+                    if (level > _dump_level) { return; }
+                    switch(level) {
+                        case 1: case 'error': _original_dump('error: '); break;
+                        case 2: case 'warn': _original_dump('warn: '); break;
+                        case 3: case 'info': _original_dump('info: '); break;
+                        case 4: case 'debug': _original_dump('debug: '); break;
+                    }
+                    _original_dump(msg);
+                } catch(E) {
+                    alert('error in dump: ' + E + '\nmsg = ' + msg + '\nlevel = ' + level + '\n');
+                }
+            };
+        }
+        ]]>
+        </script>
         <script>var djConfig = { 'baseUrl' : '/js/dojo/dojo/',parseOnLoad: true,isDebug:false };</script>
         <script type="text/javascript" src="/js/dojo/dojo/dojo.js" />
         <script type="text/javascript" src="/IDL2js" />