From 335b1471af854f463693ffdd6e7ce59f48c01311 Mon Sep 17 00:00:00 2001
From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Sat, 18 Jun 2005 04:46:48 +0000
Subject: [PATCH] some smarter debugging

git-svn-id: svn://svn.open-ils.org/ILS/trunk@841 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 .../content/evergreen/Open-ILS/OpenILS_overlay.xul |   1 +
 .../chrome/content/evergreen/auth/auth.js          |  61 ++----
 .../chrome/content/evergreen/auth/auth.xul         |   2 +-
 .../chrome/content/evergreen/util/explode.js       |  34 ++--
 .../chrome/content/evergreen/util/print.js         |  10 +-
 .../chrome/content/evergreen/util/ses.js           |  62 +++---
 .../chrome/content/evergreen/util/util.js          | 215 +++++++++++----------
 .../chrome/content/evergreen/util/util_overlay.xul |   6 +-
 .../chrome/content/evergreen/util/win.js           |  28 +--
 .../chrome/content/evergreen/util/xpcom.js         |   4 +-
 10 files changed, 200 insertions(+), 223 deletions(-)

diff --git a/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS_overlay.xul
index 5b0f5349ac..4880cb1d30 100644
--- a/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS_overlay.xul
+++ b/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS_overlay.xul
@@ -5,6 +5,7 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <OpenILS id="OpenILS_js">
+	<script src="OpenILS.js" />
 </OpenILS>
 
 </overlay>
diff --git a/Evergreen/staff_client/chrome/content/evergreen/auth/auth.js b/Evergreen/staff_client/chrome/content/evergreen/auth/auth.js
index 42da53d30d..c6fce73675 100644
--- a/Evergreen/staff_client/chrome/content/evergreen/auth/auth.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/auth/auth.js
@@ -30,12 +30,8 @@ G['actsc_hash']; // actor::stat_cat
 var mw = G['main_window'];
 var auth_meter_per = 10;
 
-function OpenILS_init() {
-	my_init();
-}
-
-function my_init() {
-	dump('TESTING: auth.js: ' + mw.G['main_test_variable'] + '\n');
+function auth_init() {
+	sdump('D_AUTH','TESTING: auth.js: ' + mw.G['main_test_variable'] + '\n');
 	var np = document.getElementById('name_prompt');
 	np.addEventListener("keypress",handle_keypress,false);
 	np.focus();
@@ -103,7 +99,7 @@ function auth_init_callback(request) {
 		alert('Login failed on auth_init: ' + js2JSON(E)); enable_login_prompts(); return;
 	}
 
-	dump( 'AUTH_INIT: ' + typeof(auth_init) + ' : ' + auth_init + '\n');
+	sdump( 'D_AUTH', 'D_AUTH_INIT: ' + typeof(auth_init) + ' : ' + auth_init + '\n');
 	var name = document.getElementById('name_prompt').value;
 	var pw = document.getElementById('password_prompt').value;
 
@@ -126,7 +122,7 @@ function auth_ses_callback(request) {
 		alert('Login failed on auth_ses: ' + js2JSON(E)); enable_login_prompts(); return;
 	}
 	mw.G.auth_ses = [ auth_ses ];
-	dump( 'AUTH_SES: ' + typeof(mw.G['auth_ses'][0]) + ' : ' + mw.G['auth_ses'][0] + '\n');
+	sdump( 'D_AUTH', 'D_AUTH_SES: ' + typeof(mw.G['auth_ses'][0]) + ' : ' + mw.G['auth_ses'][0] + '\n');
 
 	user_async_request(
 		'open-ils.actor',
@@ -191,7 +187,7 @@ function cst_list_callback(request) {
 	}
 	mw.G.cst_list = cst_list;
 	mw.G.cst_hash = convert_object_list_to_hash( cst_list );
-	dump('cst_list = ' + js2JSON(cst_list) + '\n');
+	sdump('D_AUTH', 'cst_list = ' + js2JSON(cst_list) + '\n');
 
 	user_async_request(
 		'open-ils.search',
@@ -214,7 +210,7 @@ function acpl_list_callback(request) {
 	}
 	mw.G.acpl_list = acpl_list;
 	mw.G.acpl_hash = convert_object_list_to_hash( acpl_list );
-	dump('acpl_list = ' + js2JSON(acpl_list) + '\n');
+	sdump('D_AUTH', 'acpl_list = ' + js2JSON(acpl_list) + '\n');
 
 	user_async_request(
 		'open-ils.search',
@@ -236,7 +232,7 @@ function ccs_list_callback(request) {
 	}
 	mw.G.ccs_list = ccs_list;
 	mw.G.ccs_hash = convert_object_list_to_hash( ccs_list );
-	dump('ccs_list = ' + js2JSON(ccs_list) + '\n');
+	sdump('D_AUTH', 'ccs_list = ' + js2JSON(ccs_list) + '\n');
 
 	user_async_request(
 		'open-ils.search',
@@ -259,8 +255,8 @@ function user_callback(request) {
 	}
 	mw.G.user = user;
 	mw.G.user_ou = user.home_ou();
-	dump("user: " + js2JSON(mw.G['user']) + '\n');
-	dump("user_ou: " + js2JSON(mw.G['user_ou']) + '\n');
+	sdump('D_AUTH', "user: " + js2JSON(mw.G['user']) + '\n');
+	sdump('D_AUTH', "user_ou: " + js2JSON(mw.G['user_ou']) + '\n');
 	/*user_async_request(
 		'open-ils.search',
 		'open-ils.search.actor.org_tree.retrieve',
@@ -316,7 +312,7 @@ function my_orgs_callback(request) {
 
 	mw.G.my_orgs = my_orgs;
 	mw.G.my_orgs_hash = convert_object_list_to_hash( my_orgs );
-	dump('my_orgs = ' + js2JSON(my_orgs) + '\n');
+	sdump('D_AUTH','my_orgs = ' + js2JSON(my_orgs) + '\n');
 	mw.G.acpl_my_orgs = filter_list( 
 		mw.G.acpl_list, 
 		function (obj) {
@@ -325,7 +321,7 @@ function my_orgs_callback(request) {
 		}
 	);
 	mw.G.acpl_my_orgs_hash = convert_object_list_to_hash( mw.G.acpl_my_orgs );
-	//dump('my_orgs.length = ' + mw.G.my_orgs.length + '   other_orgs.length = ' + mw.G.other_orgs.length + '\n');
+	//sdump('D_AUTH', 'my_orgs.length = ' + mw.G.my_orgs.length + '   other_orgs.length = ' + mw.G.other_orgs.length + '\n');
 
 	user_async_request(
 		'open-ils.circ',
@@ -348,7 +344,7 @@ function my_actsc_list_callback(request) {
 	}
 	mw.G.actsc_list = actsc_list;
 	mw.G.actsc_hash = convert_object_list_to_hash( actsc_list );
-	dump('actsc_list = ' + js2JSON(actsc_list) + '\n');
+	sdump('D_AUTH', 'actsc_list = ' + js2JSON(actsc_list) + '\n');
 
 	document.getElementById('auth_meter').value += auth_meter_per;
 
@@ -386,36 +382,3 @@ function nice_shutdown() {
 	window.close();
 }
 
-function test_mvc () {
-	var w = new_window('chrome://evergreen/content/blank.xul');
-	w.title = 'testing';
-	w.addEventListener('load',test_mvc2,false);
-}
-
-function test_mvc2(ev) {
-
-	// Model
-
-	var cm = user_request(
-		'open-ils.search',
-		'open-ils.search.asset.copy.batch.retrieve',
-		[ [2] ]
-	)[0][0];
-	dump('cm = ' + js2JSON(cm) + '\n');
-	
-	// View
-
-	var cv = new CopyDisplayXULView();
-
-	var doc = ev.target;
-	var cnv = doc.getElementById('canvas');
-	cv.canvas( cnv );
-
-	// Controller
-
-	var cc = new CopyController();
-	cc.add_view(cv);
-	cc.add_model(cm);
-
-	cc.render_active_view();
-}
diff --git a/Evergreen/staff_client/chrome/content/evergreen/auth/auth.xul b/Evergreen/staff_client/chrome/content/evergreen/auth/auth.xul
index 6c1eb75105..9786ff457c 100644
--- a/Evergreen/staff_client/chrome/content/evergreen/auth/auth.xul
+++ b/Evergreen/staff_client/chrome/content/evergreen/auth/auth.xul
@@ -9,7 +9,7 @@
 
 <window id="auth_win" title="&auth.title;" 
 	orient="vertical" style="overflow: auto"  persist="width height"
-	onload="OpenILS_init('login');"
+	onload="OpenILS_init('auth');"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 	<!-- More Localization -->
diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/explode.js b/Evergreen/staff_client/chrome/content/evergreen/util/explode.js
index dba4ca5710..594f77048b 100644
--- a/Evergreen/staff_client/chrome/content/evergreen/util/explode.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/util/explode.js
@@ -1,4 +1,4 @@
-dump('Loading explode.js\n');
+sdump('D_TRACE','Loading explode.js\n');
 var EXPLODE = {};
 
 function explode_aou(id) {
@@ -15,53 +15,53 @@ EXPLODE.ap = explode_ap;
 EXPLODE.au_profile = explode_ap;
 
 function magic_field_edit( ev, otype, o_id, field, explode ) {
-	dump('\nIn magic_field_edit\n')
+	sdump('D_TRACE','\nIn magic_field_edit\n')
 	var target = ev.target;
-	dump('\ttarget = ' + target + '\n');
-	dump('\totype = ' + otype + '\n');
-	dump('\tfield = ' + field + '\n');
+	sdump('D_EXPLODE','\ttarget = ' + target + '\n');
+	sdump('D_EXPLODE','\totype = ' + otype + '\n');
+	sdump('D_EXPLODE','\tfield = ' + field + '\n');
 	var value = target.value;
-	dump('\tvalue = ' + value + '\n');
-	dump('\texplode = ' + explode + '\n');
+	sdump('D_EXPLODE','\tvalue = ' + value + '\n');
+	sdump('D_EXPLODE','\texplode = ' + explode + '\n');
 	try {
 		if (explode) {
 			var command = ( 'value = EXPLODE.' + otype + '_' + field + '(' + value + ');' );
-			dump('\tcommand = ' + command + '\n');
+			sdump('D_EXPLODE','\tcommand = ' + command + '\n');
 			eval( command );
 		}
 	} catch(E) {
-		dump( '\tNo EXPLODE.' + otype + '_' + field + '() defined\n' );
+		sdump('D_EXPLODE', '\tNo EXPLODE.' + otype + '_' + field + '() defined\n' );
 	}
-	dump('\tvalue = ' + value + '\n');
-	dump('\t' + otype + '_id = ' + o_id + '\n');
+	sdump('D_EXPLODE','\tvalue = ' + value + '\n');
+	sdump('D_EXPLODE','\t' + otype + '_id = ' + o_id + '\n');
 	// ######## method 1, node in element
 	var row = document.getElementById( otype + o_id );
 	if (row) {
 		var node = JSON2js(row.getAttribute('node'));
-		dump('\telem: original node = ' + js2JSON(node) + '\n');
+		sdump('D_EXPLODE','\telem: original node = ' + js2JSON(node) + '\n');
 		var command = ( 'node.' + field + '(' + js2JSON(value) + ');');
 		eval(command);
 		var command2 = ( 'node.ischanged("1");');
 		eval(command2);
-		dump('\telem:    after edit = ' + js2JSON(node) + '\n');
+		sdump('D_EXPLODE','\telem:    after edit = ' + js2JSON(node) + '\n');
 		row.setAttribute('node',js2JSON(node));
 	} else {
-		dump('\tCould not find containing element with id = ' + otype + o_id + '\n');
+		sdump('D_EXPLODE','\tCould not find containing element with id = ' + otype + o_id + '\n');
 	}
 	// ######## method 2, node in hash
 	try {
 		var myhash = eval('hash_'+otype);
 		if (typeof(myhash) == 'object') {
 			if (! myhash[o_id] ) { myhash[o_id] = eval('new ' + otype + '();'); }
-			dump('\thash: original node = ' + js2JSON(myhash[o_id]) + '\n');
+			sdump('D_EXPLODE','\thash: original node = ' + js2JSON(myhash[o_id]) + '\n');
 			var command = ('myhash[o_id].' + field + '(' + js2JSON(value) + ');');
 			eval(command);
 			var command2 = ( 'myhash[o_id].ischanged("1");');
 			eval(command2);
-			dump('\thash:    after edit = ' + js2JSON(myhash[o_id]) + '\n');
+			sdump('D_EXPLODE','\thash:    after edit = ' + js2JSON(myhash[o_id]) + '\n');
 		}
 	} catch(E) {
-		dump('magic_field_edit: ' + js2JSON(E) + '\n');
+		sdump('D_EXPLODE','magic_field_edit: ' + js2JSON(E) + '\n');
 	}
 }
 
diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/print.js b/Evergreen/staff_client/chrome/content/evergreen/util/print.js
index c8d6d388dc..5ba79fa7c8 100644
--- a/Evergreen/staff_client/chrome/content/evergreen/util/print.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/util/print.js
@@ -1,4 +1,4 @@
-dump('Loading print.js\n');
+sdump('D_TRACE','Loading print.js\n');
 
 function sPrint(s) {
 	//var w = window.open('about:blank','print_win','alwaysLowered,minimizable,resizable,height=100,width=100,sizemode=minimized');
@@ -11,7 +11,7 @@ function sPrint(s) {
 }
 
 function sPrint_old(s) {
-	dump('Printing "' + s + '"\n');
+	sdump('D_PRINT','Printing "' + s + '"\n');
 	//var deck = mw.document.getElementById('main_deck');
 	var iframe = mw.document.getElementById('print_frame');
 	//deck.appendChild(iframe);
@@ -57,7 +57,7 @@ function NSPrint(w)
 	// Pressing cancel is expressed as an NS_ERROR_ABORT return value,
 	// causing an exception to be thrown which we catch here.
 	// Unfortunately this will also consume helpful failures, so add a
-	 	dump('PRINT EXCEPTION: ' + js2JSON(e) + '\n'); // if you need to debug
+	 	sdump('D_PRINT','PRINT EXCEPTION: ' + js2JSON(e) + '\n'); // if you need to debug
 	}
 }
 
@@ -78,7 +78,7 @@ function NSPrint2(w) {
 	// Pressing cancel is expressed as an NS_ERROR_ABORT return value,
 	// causing an exception to be thrown which we catch here.
 	// Unfortunately this will also consume helpful failures, so add a
-	 	dump('PRINT EXCEPTION: ' + js2JSON(e) + '\n'); // if you need to debug
+	 	sdump('D_PRINT','PRINT EXCEPTION: ' + js2JSON(e) + '\n'); // if you need to debug
 	}
 
 }
@@ -106,7 +106,7 @@ function GetPrintSettings()
        }
      }
    } catch (e) {
-     dump("GetPrintSettings() "+e+"\n");
+     sdump('D_PRINT',"GetPrintSettings() "+e+"\n");
      alert("GetPrintSettings() "+e+"\n");
    }
  
diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/ses.js b/Evergreen/staff_client/chrome/content/evergreen/util/ses.js
index f749dee6d3..1e7ad5ec66 100644
--- a/Evergreen/staff_client/chrome/content/evergreen/util/ses.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/util/ses.js
@@ -1,64 +1,64 @@
-dump('Loading ses.js\n');
+sdump('D_TRACE','Loading ses.js\n');
 
 //////////////////////////////////////////////////////////////////////////////
 // Sessions, Requests, Methods, Oh My
 
 function handle_session(app) {
 	//if( ses == null || ! AppSession.transport_handle.connected() ) {
-	dump('Calling new AppSession : ' + timer_elapsed('cat') + '\n');
+	sdump('D_TRACE','Calling new AppSession : ' + timer_elapsed('cat') + '\n');
 		ses = new AppSession( app );
-		dump( 'after AppSession ses = ' + (ses.state) + '\n' );
+		sdump('D_SES', 'after AppSession ses = ' + (ses.state) + '\n' );
 		if( ! ses.connect() ) { 
-			dump( 'after ses.connect ses = ' + js2JSON(ses.state) + '\n' );
+			sdump('D_SES', 'after ses.connect ses = ' + js2JSON(ses.state) + '\n' );
 			throw( "Connect timed out!" ); 
 		}
-		dump( 'after ses.connect ses = ' + js2JSON(ses.state) + '\n' );
-	dump('Finished new AppSession : ' + timer_elapsed('cat') + '\n');
+		sdump('D_SES', 'after ses.connect ses = ' + js2JSON(ses.state) + '\n' );
+	sdump('D_TRACE','Finished new AppSession : ' + timer_elapsed('cat') + '\n');
 	//}
 }
 
 function handle_request(ses,meth) {
 
 
-	dump('Entering handle_request : ' + timer_elapsed('cat') + '\n');
-	dump('Calling new AppRequest : ' + timer_elapsed('cat') + '\n');
+	sdump('D_TRACE','Entering handle_request : ' + timer_elapsed('cat') + '\n');
+	sdump('D_SES','Calling new AppRequest : ' + timer_elapsed('cat') + '\n');
 
 	var req = new AppRequest( ses, meth );
 
-	dump('Finished new AppRequest : ' + timer_elapsed('cat') + '\n');
-	dump('Calling new req.make_request() : ' + timer_elapsed('cat') + '\n');
+	sdump('D_SES','Finished new AppRequest : ' + timer_elapsed('cat') + '\n');
+	sdump('D_SES','Calling new req.make_request() : ' + timer_elapsed('cat') + '\n');
 
 	req.make_request();
 
-	dump( 'after req.make_request ses = ' + js2JSON(ses.state) + '\n' );
-	dump('Finished new req.make_request() : ' + timer_elapsed('cat') + '\n');
+	sdump('D_SES', 'after req.make_request ses = ' + js2JSON(ses.state) + '\n' );
+	sdump('D_SES','Finished new req.make_request() : ' + timer_elapsed('cat') + '\n');
 
 	var result = new Array(); var resp;
 
-	dump('Looping on req.recv and resp.getContent(): ' + timer_elapsed('cat') + '\n');
+	sdump('D_SES','Looping on req.recv and resp.getContent(): ' + timer_elapsed('cat') + '\n');
 
 	while (resp = req.recv( 30000 ) ) {
-		dump( '\tafter req.recv ses = ' + js2JSON(ses.state) + ' : req.is_complete = ' + req.is_complete + '\n' );
+		sdump('D_SES', '\tafter req.recv ses = ' + js2JSON(ses.state) + ' : req.is_complete = ' + req.is_complete + '\n' );
 		var r = resp.getContent();
 		if (r != 'keepalive') {
 			result.push( r );
 		}
 	}
 
-	dump('Finished with req.recv and resp.getContent(): ' + timer_elapsed('cat') + '\n');
+	sdump('D_SES','Finished with req.recv and resp.getContent(): ' + timer_elapsed('cat') + '\n');
 
 	if (result.length == 0) {
 		if ( req.is_complete ) {
 			result.push("NO RESPONSE, REQUEST COMPLETE");
-			dump("NO RESPONSE, REQUEST COMPLETE\n");
+			sdump('D_SES',"NO RESPONSE, REQUEST COMPLETE\n");
 		} else {
 			result.push("NO RESPONSE, REQUEST TIMEOUT");
-			dump("NO RESPONSE, REQUEST TIMEOUT\n");
+			sdump('D_SES',"NO RESPONSE, REQUEST TIMEOUT\n");
 		}
 	}
 	req.finish();
-	dump( 'after req.finish() ses = ' + js2JSON(ses.state) + '\n' );
-	dump('Exiting handle_request : ' + timer_elapsed('cat') + '\n');
+	sdump('D_SES', 'after req.finish() ses = ' + js2JSON(ses.state) + '\n' );
+	sdump('D_SES','Exiting handle_request : ' + timer_elapsed('cat') + '\n');
 	return result;	
 }
 
@@ -66,8 +66,8 @@ function handle_request(ses,meth) {
 
 
 function user_request(app,name,params) {
-	dump('=-=-=-=-= user_request:\n');
-	dump('request '+(app)+' '+(name)+' '+js2JSON(params)+'\n');
+	sdump('D_SES','=-=-=-=-= user_request:\n');
+	sdump('D_SES','request '+(app)+' '+(name)+' '+js2JSON(params)+'\n');
 	var request = new RemoteRequest( app, name );
 	for(var index in params) {
 		request.addParam(params[index]);
@@ -75,13 +75,13 @@ function user_request(app,name,params) {
 	request.send(true);
 	var result = [];
 	result.push( request.getResultObject() );
-	//dump('=-=-= result = ' + js2JSON(result[0]) + '\n');
+	//sdump('D_SES','=-=-= result = ' + js2JSON(result[0]) + '\n');
 	return result;
 }
 
 function user_async_request(app,name,params,func) {
-	dump('=-=-=-=-= user_async_request: ' + js2JSON(func) + '\n');
-	dump('request '+(app)+' '+(name)+' '+js2JSON(params)+'\n');
+	sdump('D_SES','=-=-=-=-= user_async_request: ' + js2JSON(func) + '\n');
+	sdump('D_SES','request '+(app)+' '+(name)+' '+js2JSON(params)+'\n');
 	var request = new RemoteRequest( app, name );
 	for(var index in params) {
 		request.addParam(params[index]);
@@ -100,8 +100,8 @@ function sample_func(request) {
 
 function _user_request(app,name,params) {
 
-	dump('Entering user_request : ' + timer_elapsed('cat') + '\n');
-	dump('app='+app+' name='+name+'\n');
+	sdump('D_SES','Entering user_request : ' + timer_elapsed('cat') + '\n');
+	sdump('D_SES','app='+app+' name='+name+'\n');
 	try {
 
 		handle_session(app);
@@ -116,18 +116,18 @@ function _user_request(app,name,params) {
 		var result = handle_request(ses,meth);
 		
 		if (ses) { 
-			dump('ses.disconnect\n'); 
+			sdump('D_SES','ses.disconnect\n'); 
 			ses.disconnect(); 
-			dump( 'after ses.disconnect() ses = ' + js2JSON(ses.state) + '\n' );
+			sdump('D_SES', 'after ses.disconnect() ses = ' + js2JSON(ses.state) + '\n' );
 			ses.destroy();
-			dump( 'after ses.destroy() ses = ' + js2JSON(ses.state) + '\n' );
+			sdump('D_SES', 'after ses.destroy() ses = ' + js2JSON(ses.state) + '\n' );
 		}
 
-		dump('Exiting user_request : ' + timer_elapsed('cat') + '\n');
+		sdump('D_SES','Exiting user_request : ' + timer_elapsed('cat') + '\n');
 		return result;
 
 	} catch( E ) { 
-		dump('Exiting user_request : ' + timer_elapsed('cat') + '\n');
+		sdump('D_SES','Exiting user_request : ' + timer_elapsed('cat') + '\n');
 		alert( pretty_print( js2JSON(E) ) ); 
 		return null;
 	}
diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/util.js b/Evergreen/staff_client/chrome/content/evergreen/util/util.js
index aa523ee56e..a59f083ba1 100644
--- a/Evergreen/staff_client/chrome/content/evergreen/util/util.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/util/util.js
@@ -4,6 +4,19 @@ var timer = {};
 var counter = {};
 var treeitem_id = 0;
 
+function sdump(level,msg) {
+	var D_TRACE = true;
+	var D_AUTH = false;
+	var D_UTIL = false;
+	var D_EXPLODE = false;
+	var D_PRINT = false;
+	var D_SES = false;
+	try {
+		if (eval(level))
+			debug(msg);
+	} catch(E) {}
+}
+
 function snd_bad() {
 	mw.G.sound.play( xp_url_init('chrome://evergreen/content/media/redalert.wav') );
 }
@@ -63,10 +76,10 @@ function string_to_array(s) {
 
 function textbox_checkdigit(ev) {
 	if ( check_checkdigit( ev.target.value ) ) {
-		dump('success\n');
+		sdump('D_UTIL', 'success\n');
 		return true;
 	} else {
-		dump('failure\n');
+		sdump('D_UTIL', 'failure\n');
 		ev.preventDefault();
 		ev.stopPropagation();
 		return false;
@@ -78,36 +91,36 @@ function check_checkdigit(barcode) {
 	var stripped_barcode = barcode.slice(0,-1);
 	var checkdigit = barcode.slice(-1);
 
-	dump('\n\n=-=***=-=\n\ncheck_checkdigit: barcode = ' + barcode + ' barcode stripped = ' + stripped_barcode + ' checkdigit = ' + checkdigit + '\n');
+	sdump('D_UTIL', '\n\n=-=***=-=\n\ncheck_checkdigit: barcode = ' + barcode + ' barcode stripped = ' + stripped_barcode + ' checkdigit = ' + checkdigit + '\n');
 
 	var sum = 0; var mul = 2;
 
 	var b_array = string_to_array( stripped_barcode ).reverse();
-	dump( '\tb_array = ' + b_array + '\n');
+	sdump('D_UTIL', '\tb_array = ' + b_array + '\n');
 
 	for (var i in b_array) {
 		var digit = parseInt( b_array[i] );
-		dump('\t\tdigit = ' + digit + '\n');
+		sdump('D_UTIL', '\t\tdigit = ' + digit + '\n');
 
 		var product = digit * mul;
 		if (mul == 2) { mul = 1; } else { mul = 2; }
 
 		var p_array = string_to_array( product.toString() );
-		dump( '\t\tp_array = ' + p_array + '\n');
+		sdump('D_UTIL', '\t\tp_array = ' + p_array + '\n');
 
 		for (var j in p_array) { 
 			var n = parseInt( p_array[j] );
-			dump('\t\t\tn = ' + n + '\n');
+			sdump('D_UTIL', '\t\t\tn = ' + n + '\n');
 			sum += n;
 		}
 	}
 
-	dump('\tsum = ' + sum + '\n');
+	sdump('D_UTIL', '\tsum = ' + sum + '\n');
 
 	var s_array = string_to_array( sum.toString() );
 	var calculated_checkdigit = s_array.pop();
 	if (calculated_checkdigit > 0) calculated_checkdigit = 10 - calculated_checkdigit;
-	dump('\tcalculated checkdigit = ' + calculated_checkdigit + '\n\n=-=***=-=\n\n');
+	sdump('D_UTIL', '\tcalculated checkdigit = ' + calculated_checkdigit + '\n\n=-=***=-=\n\n');
 
 	return ( calculated_checkdigit == checkdigit );
 }
@@ -117,34 +130,34 @@ function fake_tab_for_textboxes(w,current) {
 	if (typeof(w)!='object') {
 		w = document.getElementById(w);
 	}
-	dump('fake_tab_for_textboxes: Current ' + current + '\n');
+	sdump('D_UTIL', 'fake_tab_for_textboxes: Current ' + current + '\n');
 	var nl = w.getElementsByTagName('textbox');
 	//var nl = document.getElementsByTagName('textbox');
-	dump('fake_tab_for_textboxes: nl.length = ' + nl.length + '\n');
+	sdump('D_UTIL', 'fake_tab_for_textboxes: nl.length = ' + nl.length + '\n');
 	for (var i = 0; i < nl.length; i++) {
-		dump('fake_tab_for_textboxes: Considering ' + nl[i] + '...\n');
+		sdump('D_UTIL', 'fake_tab_for_textboxes: Considering ' + nl[i] + '...\n');
 		if (flag && !next_one) {
-			dump('fake_tab_for_textboxes: Setting next_one ' + nl[i] + '\n');	
+			sdump('D_UTIL', 'fake_tab_for_textboxes: Setting next_one ' + nl[i] + '\n');	
 			next_one = nl[i];
 		}
 		if (nl[i] === current) {
-			dump('fake_tab_for_textboxes: Found current\n');
+			sdump('D_UTIL','fake_tab_for_textboxes: Found current\n');
 			flag = true;
 		}
 	}
 	if (!next_one) {
-		dump('fake_tab_for_textboxes: Out of loop, Setting next_one ' + nl[0] + '\n');	
+		sdump('D_UTIL','fake_tab_for_textboxes: Out of loop, Setting next_one ' + nl[0] + '\n');	
 		next_one = nl[0];
 	}
 	if (next_one) {
 		next_one.focus(); next_one.select();
 	} else {
-		dump('fake_tab_for_textboxes: next_one not set\n');
+		sdump('D_UTIL','fake_tab_for_textboxes: next_one not set\n');
 	}
 }
 
 function get_list_from_tree_selection(tree_w) {
-	dump('entering get_list_from_tree...\n');
+	sdump('D_UTIL','entering get_list_from_tree...\n');
 	var hitlist;
 	if (typeof(tree_w) != 'object') {
 		hitlist = document.getElementById(tree_w);
@@ -159,11 +172,11 @@ function get_list_from_tree_selection(tree_w) {
 		hitlist.view.selection.getRangeAt(t,start,end);
 		for (var v=start.value; v<=end.value; v++){
 			var i = hitlist.contentView.getItemAtIndex(v);
-			//dump(i.tagName + '\n');
+			//sdump('D_UTIL',i.tagName + '\n');
 			list.push( i );
 		}
 	}
-	dump('leaving get_list_from_tree...\n');
+	sdump('D_UTIL','leaving get_list_from_tree...\n');
 	return list;
 }
 
@@ -219,7 +232,7 @@ function debug() {
 	for (var i = 0; i < arguments.length; i++) {
 		s = s + arguments[i];
 	}
-	//dump('debug:' + s + '\n');
+	//sdump('D_UTIL','debug:' + s + '\n');
 }
 */
 
@@ -315,12 +328,12 @@ function pretty_print(s) {
 function enable_widgets() {
 	for (var i = 0; i < arguments.length; i++) {
 		if (typeof(arguments[i]) == 'object') {
-			dump(arguments[i] + '.disabled = false;\n');
+			sdump('D_UTIL',arguments[i] + '.disabled = false;\n');
 			arguments[i].disabled = false;
 		} else {
 			var w = document.getElementById( arguments[i] );
 			if (w) { 
-				dump(w + '.disabled = false;\n');
+				sdump('D_UTIL',w + '.disabled = false;\n');
 				w.disabled = false; 
 			}
 		}
@@ -330,12 +343,12 @@ function enable_widgets() {
 function disable_widgets() {
 	for (var i = 0; i < arguments.length; i++) {
 		if (typeof(arguments[i]) == 'object') {
-			dump(arguments[i] + '.disabled = true;\n');
+			sdump('D_UTIL',arguments[i] + '.disabled = true;\n');
 			arguments[i].disabled = true;
 		} else {
 			var w = document.getElementById( arguments[i] );
 			if (w) { 
-				dump(w + '.disabled = true;\n');
+				sdump('D_UTIL',w + '.disabled = true;\n');
 				w.disabled = true; 
 			}
 		}
@@ -353,13 +366,13 @@ function focus_widget(e) {
 
 function empty_widget(e) {
 	if (typeof(e) != 'object') { e = document.getElementById(e); }
-	if (typeof(e) != 'object') { dump('Failed on empty_widget\n'); return; }
+	if (typeof(e) != 'object') { sdump('D_UTIL','Failed on empty_widget\n'); return; }
 	while (e.lastChild) { e.removeChild(e.lastChild); }
 }
 
 function empty_listbox(e) {
 	if (typeof(e) != 'object') { e = document.getElementById(e); }
-	if (typeof(e) != 'object') { dump('Failed on empty_listbox\n'); return; }
+	if (typeof(e) != 'object') { sdump('D_UTIL','Failed on empty_listbox\n'); return; }
 	var nl = e.getElementsByTagName('listitem');
 	for (var i = 0; i < nl.length; i++) {
 		e.removeChild(nl[i]);
@@ -368,13 +381,13 @@ function empty_listbox(e) {
 
 function swap_attributes(e,a1,a2) {
 	if (typeof(e) != 'object') { e = document.getElementById(e); }
-	if (typeof(e) != 'object') { dump('Failed on swap_attributes\n'); return; }
+	if (typeof(e) != 'object') { sdump('D_UTIL','Failed on swap_attributes\n'); return; }
 	var a1_v = e.getAttribute(a1);
 	var a2_v = e.getAttribute(a2);
 	e.setAttribute(a1,a2_v);
 	e.setAttribute(a2, a1_v);
-	dump('before: a1 = ' + a1_v + ' a2 = ' + a2_v + ' and ');
-	dump('after: a1 = ' + a2_v + ' a2 = ' + a1_v + '\n');
+	sdump('D_UTIL','before: a1 = ' + a1_v + ' a2 = ' + a2_v + ' and ');
+	sdump('D_UTIL','after: a1 = ' + a2_v + ' a2 = ' + a1_v + '\n');
 }
 
 function cycle_attribute(e,a,v) {
@@ -387,11 +400,11 @@ function cycle_attribute(e,a,v) {
 
 		var toggle = e.getAttribute(a);
 		var next_one = false;
-		dump('cycling ' + a + ' on ' + e.getAttribute('id') + ' to ');
+		sdump('D_UTIL','cycling ' + a + ' on ' + e.getAttribute('id') + ' to ');
 		for (var i = 0; i < v.length; i++) {
 			if (next_one) {
 				e.setAttribute(a,v[i]);
-				dump(v[i] + '\n');
+				sdump('D_UTIL',v[i] + '\n');
 				return v[i];
 			}
 			if (toggle == v[i]) {
@@ -400,14 +413,14 @@ function cycle_attribute(e,a,v) {
 		}
 		if (next_one) {
 			e.setAttribute(a,v[0]);
-			dump(v[0] + '\n');
+			sdump('D_UTIL',v[0] + '\n');
 			return v[0];
 		} else {
 			throw('current value not in list');
 		}
 	} catch(E) {
-		dump('cycle_attribute error: ' + js2JSON(E) + '\n');
-		dump('null\n');
+		sdump('D_UTIL','cycle_attribute error: ' + js2JSON(E) + '\n');
+		sdump('D_UTIL','null\n');
 		return null;
 	}
 }
@@ -429,7 +442,7 @@ function radio_checkbox(ev) {
                 }
 		target.checked = true;
 	} else {
-		dump('radio_checkbox: Checkbox must have a group attribute to find peers');
+		sdump('D_UTIL','radio_checkbox: Checkbox must have a group attribute to find peers');
 	}
 }
 
@@ -442,7 +455,7 @@ function toggle_hidden_grid_rows(grid) {
 	for (var r = 0; r < rows.childNodes.length; r++ ) {
 		var row = rows.childNodes[r];
 		if (typeof(row) == 'object') {
-			//dump('toggle row = ' + row + '\n');
+			//sdump('D_UTIL','toggle row = ' + row + '\n');
 			var hidden = row.getAttribute('hidden');
 			if (hidden == 'true') {
 				row.setAttribute('hidden','false');
@@ -473,14 +486,14 @@ function xul_setAttributes(el,attrs) {
 function append_treeitem() {
 	var id = arguments[0];
 	var treechildren = document.getElementById(id);
-	if (!treechildren) { dump('No ' + id + ' to append to\n'); return; }
+	if (!treechildren) { sdump('D_UTIL','No ' + id + ' to append to\n'); return; }
 	var treeitem = document.createElement('treeitem'); treechildren.appendChild(treeitem);
 	var treerow = document.createElement('treerow'); treeitem.appendChild(treerow);
 	for (var i = 1; i < arguments.length ; i++ ) {
 		var treecell = document.createElement('treecell'); treerow.appendChild(treecell);
 		treecell.setAttribute('label',arguments[i]);
 			treecell.setAttribute('id', 'treeitem_' + treeitem_id + '_' + i);
-		//dump('treecell.label = ' + arguments[i] + '\n');
+		//sdump('D_UTIL','treecell.label = ' + arguments[i] + '\n');
 	}
 	return treeitem_id++;
 }
@@ -556,32 +569,32 @@ function get_my_orgs(user_ou) {
 
 	// self and ancestors
 	var current_item_id = user_ou.id();
-	//dump('mw.G[user_ou] = ' + js2JSON(mw.G['user_ou']) + '\n');
-	//dump('current_item_id = ' + current_item_id + '\n');
+	//sdump('D_UTIL','mw.G[user_ou] = ' + js2JSON(mw.G['user_ou']) + '\n');
+	//sdump('D_UTIL','current_item_id = ' + current_item_id + '\n');
 	var item_ou; var my_orgs = {}; var other_orgs = {};
 	while( item_ou = find_ou(mw.G['org_tree'],current_item_id) ) {
-		//dump('\titem_ou = ' + js2JSON(item_ou) + '\n');
+		//sdump('D_UTIL','\titem_ou = ' + js2JSON(item_ou) + '\n');
 		my_orgs[ item_ou.id() ] = item_ou;
 		current_item_id = item_ou.parent_ou();
 		if (!current_item_id) { break; }
 	}
 
         current_item_id = user_ou.id();
-	//dump('self & ancestors : my_orgs = <<<'+js2JSON(my_orgs)+'>>>\n');
+	//sdump('D_UTIL','self & ancestors : my_orgs = <<<'+js2JSON(my_orgs)+'>>>\n');
 	// descendants
 	var my_children;
         var find_ou_result = find_ou(mw.G['org_tree'],current_item_id);
 	if (find_ou_result) { 
 		my_children = find_ou_result.children() } 
 	else {
-		dump('ERROR: find_ou(org_tree,'+current_item_id+') returned with no properties\n');
+		sdump('D_UTIL','ERROR: find_ou(org_tree,'+current_item_id+') returned with no properties\n');
 	};
-	//dump('my_children: ' + my_children + ' : ' + js2JSON(my_children) + '\n');
+	//sdump('D_UTIL','my_children: ' + my_children + ' : ' + js2JSON(my_children) + '\n');
         if (my_children) {
                 for (var i = 0; i < my_children.length; i++) {
                         var my_child = my_children[i];
                         my_orgs[ my_child.id() ] = my_child;
-			//dump('my_child.children(): ' + my_child.children() + ' : ' + js2JSON(my_child.children()) + '\n');
+			//sdump('D_UTIL','my_child.children(): ' + my_child.children() + ' : ' + js2JSON(my_child.children()) + '\n');
 			if (my_child.children() != null) {
                         	for (var j = 0; j < my_child.children().length; j++) {
 					var my_gchild = my_child.children()[j];
@@ -590,7 +603,7 @@ function get_my_orgs(user_ou) {
 			}
                 }
         }
-	//dump('& descendants : my_orgs = <<<'+js2JSON(my_orgs)+'>>>\n');
+	//sdump('D_UTIL','& descendants : my_orgs = <<<'+js2JSON(my_orgs)+'>>>\n');
 	return my_orgs;
 }
 
@@ -598,7 +611,7 @@ function get_other_orgs(org,other_orgs) {
 }
 
 function flatten_ou_branch(branch) {
-	//dump('flatten: branch = ' + js2JSON(branch) + '\n');
+	//sdump('D_UTIL','flatten: branch = ' + js2JSON(branch) + '\n');
 	var my_array = new Array();
 	my_array.push( branch );
 	for (var i in branch.children() ) {
@@ -683,7 +696,7 @@ function convert_object_list_to_hash(list) {
 }
 
 function find_id_object_in_list(list,id) {
-	//dump('find_id_object_in_list(' + js2JSON(list).substr(0,20) + '... ,' + id + ')\n');
+	//sdump('D_UTIL','find_id_object_in_list(' + js2JSON(list).substr(0,20) + '... ,' + id + ')\n');
 	if (list) {
 		for (var i = 0; i < list.length; i++ ) {
 			try {
@@ -691,25 +704,25 @@ function find_id_object_in_list(list,id) {
 					return list[i];
 				}
 			} catch(E) {
-				dump('find_id_object_in_list error, i = ' + i + '  typeof(list[i]) = ' + typeof(list[i]) + '  list[i] = ' + js2JSON(list[i]) + ' : ' + js2JSON(E) + '\n');
+				sdump('D_UTIL','find_id_object_in_list error, i = ' + i + '  typeof(list[i]) = ' + typeof(list[i]) + '  list[i] = ' + js2JSON(list[i]) + ' : ' + js2JSON(E) + '\n');
 			}
 		}
 	}
-	//dump('not found\n');
+	//sdump('D_UTIL','not found\n');
 	return null;
 }
 
 function find_attr_object_in_list(list,attr,value) {
 	if (list) {
 		for (var i = 0; i < list.length; i++ ) {
-			dump('find_attr_object_in_list: i = ' + i + '  id = ' + list[i].id() + '\n');
+			sdump('D_UTIL','find_attr_object_in_list: i = ' + i + '  id = ' + list[i].id() + '\n');
 			try {
 				var command = 'list[' + i + '].'+attr+'() == ' + value;
 				if ( eval(command) ) {
 					return list[i];
 				}
 			} catch(E) {
-				dump('find_attr_object_in_list error, i = ' + i + '  typeof(list[i]) = ' + typeof(list[i]) + '  list[i] = ' + js2JSON(list[i]) + ' :   list = ' + js2JSON(list) + ' : ' + js2JSON(E) + '\n');
+				sdump('D_UTIL','find_attr_object_in_list error, i = ' + i + '  typeof(list[i]) = ' + typeof(list[i]) + '  list[i] = ' + js2JSON(list[i]) + ' :   list = ' + js2JSON(list) + ' : ' + js2JSON(E) + '\n');
 			}
 		}
 	}
@@ -730,14 +743,14 @@ function find_ou_by_shortname(tree,sn) {
 }
 
 function populate_listbox_with_local_stat_cats_myself(local_stat_cats,local_cat_entries,listbox,libs,app,method,editable) {
-	dump('populate_local_stat_cats: pertinent libs = ' + js2JSON(libs) + '\n');
+	sdump('D_UTIL','populate_local_stat_cats: pertinent libs = ' + js2JSON(libs) + '\n');
 
 	local_stat_cats = user_request(
 		app,
 		method,
 		[ mw.G.auth_ses[0], libs ]
 	)[0];
-	//dump('local_stat_cats = ' + pretty_print( js2JSON( local_stat_cats ) ) + '\n');
+	//sdump('D_UTIL','local_stat_cats = ' + pretty_print( js2JSON( local_stat_cats ) ) + '\n');
 
 	var list = listbox;
 	if (typeof list != 'object') list = document.getElementById(list);
@@ -749,28 +762,28 @@ function populate_listbox_with_local_stat_cats_myself(local_stat_cats,local_cat_
 		var listitem = document.createElement('listitem'); 
 		list.appendChild(listitem);
 		listitem.setAttribute('allowevents','true');
-		dump('listitem = ' + listitem + '\n');
+		sdump('D_UTIL','listitem = ' + listitem + '\n');
 
 			var label = document.createElement('listcell'); 
 			listitem.appendChild(label);
 			label.setAttribute('label',stat_cat.name() );
-			dump('\tlistcell = ' + label + '\n');
+			sdump('D_UTIL','\tlistcell = ' + label + '\n');
 
 			var menucell = document.createElement('listcell'); 
 			listitem.appendChild(menucell);
-			dump('\tlistcell = ' + menucell + '\n');
+			sdump('D_UTIL','\tlistcell = ' + menucell + '\n');
 
 				var menulist = document.createElement('menulist');
 				menucell.appendChild(menulist);
 				if (editable) { menulist.setAttribute('editable','true'); }
 				menulist.setAttribute('id','menulist_stat_cat_'+stat_cat.id());
-				dump('\tmenulist = ' + menulist + '\n');
+				sdump('D_UTIL','\tmenulist = ' + menulist + '\n');
 
 					var menupopup = document.createElement('menupopup');
 					menulist.appendChild(menupopup);
 					menupopup.setAttribute('stat_cat',stat_cat.id());
 					menupopup.setAttribute('oncommand','apply_attribute(event);');
-					dump('\t\tmenupopup = ' + menupopup + '\n');
+					sdump('D_UTIL','\t\tmenupopup = ' + menupopup + '\n');
 
 		for (var j in stat_cat.entries() ) {
 
@@ -787,25 +800,25 @@ function populate_listbox_with_local_stat_cats_myself(local_stat_cats,local_cat_
 			}
 			menuitem.setAttribute('stat_cat',stat_cat.id());
 			menuitem.setAttribute('id','menuitem_stat_cat_entry_' + stat_entry.id());
-			dump('\t\t\tmenuitem = ' + menuitem + '\n');
+			sdump('D_UTIL','\t\t\tmenuitem = ' + menuitem + '\n');
 
 		}
 
 	}
 
-	//dump('local_stat_cat_entries = ' + pretty_print( js2JSON( local_stat_cat_entries ) ) + '\n');
+	//sdump('D_UTIL','local_stat_cat_entries = ' + pretty_print( js2JSON( local_stat_cat_entries ) ) + '\n');
 
 }
 
 function populate_rows_with_local_stat_cats(local_stat_cats,local_stat_cat_entries,rows,editable) {
-	//dump('populate_local_stat_cats: pertinent libs = ' + js2JSON(libs) + '\n');
+	//sdump('D_UTIL','populate_local_stat_cats: pertinent libs = ' + js2JSON(libs) + '\n');
 
 	/*local_stat_cats = user_request(
 		app,
 		method,
 		[ mw.G.auth_ses[0], libs ]
 	)[0];*/
-	//dump('local_stat_cats = ' + pretty_print( js2JSON( local_stat_cats ) ) + '\n');
+	//sdump('D_UTIL','local_stat_cats = ' + pretty_print( js2JSON( local_stat_cats ) ) + '\n');
 
 	if (typeof rows != 'object') rows = document.getElementById(rows);
 
@@ -825,13 +838,13 @@ function populate_rows_with_local_stat_cats(local_stat_cats,local_stat_cat_entri
 		if (editable) { menulist.setAttribute('editable','true'); }
 		menulist.setAttribute('id','menulist_stat_cat_'+stat_cat.id());
 		menulist.setAttribute('stat_cat_id',stat_cat.id());
-		dump('\tmenulist = ' + menulist + '\n');
+		sdump('D_UTIL','\tmenulist = ' + menulist + '\n');
 
 			var menupopup = document.createElement('menupopup');
 			menulist.appendChild(menupopup);
 			menupopup.setAttribute('stat_cat',stat_cat.id());
 			menupopup.setAttribute('command','cmd_apply');
-			dump('\t\tmenupopup = ' + menupopup + '\n');
+			sdump('D_UTIL','\t\tmenupopup = ' + menupopup + '\n');
 
 		for (var j in stat_cat.entries() ) {
 
@@ -848,18 +861,18 @@ function populate_rows_with_local_stat_cats(local_stat_cats,local_stat_cat_entri
 			}
 			menuitem.setAttribute('stat_cat',stat_cat.id());
 			menuitem.setAttribute('id','menuitem_stat_cat_entry_' + stat_entry.id());
-			dump('\t\t\tmenuitem = ' + menuitem + '\n');
+			sdump('D_UTIL','\t\t\tmenuitem = ' + menuitem + '\n');
 
 		}
 
 	}
 
-	//dump('local_stat_cat_entries = ' + pretty_print( js2JSON( local_stat_cat_entries ) ) + '\n');
+	//sdump('D_UTIL','local_stat_cat_entries = ' + pretty_print( js2JSON( local_stat_cat_entries ) ) + '\n');
 
 }
 
 function populate_copy_status_list(menulist,menupopup,defaultccs) {
-	dump('populate_copy_status_list\n');
+	sdump('D_UTIL','populate_copy_status_list\n');
 	var popup = document.getElementById(menupopup);
 
 	if (popup) {
@@ -869,7 +882,7 @@ function populate_copy_status_list(menulist,menupopup,defaultccs) {
 			menuitem.setAttribute('label', mw.G.ccs_list[i].name()); 
 			menuitem.setAttribute('value', mw.G.ccs_list[i].id()); 
 			menuitem.setAttribute('id', 'ccsitem' + mw.G.ccs_list[i].id()); 
-			//dump('pop_ccs_list: i = ' + i + ' ccs = ' + mw.G.ccs_list[i] + ' = ' + js2JSON(mw.G.ccs_list[i]) + '\n');
+			//sdump('D_UTIL','pop_ccs_list: i = ' + i + ' ccs = ' + mw.G.ccs_list[i] + ' = ' + js2JSON(mw.G.ccs_list[i]) + '\n');
 			popup.appendChild(menuitem);
 		}
 		var list = document.getElementById(menulist);
@@ -883,21 +896,21 @@ function populate_copy_status_list(menulist,menupopup,defaultccs) {
 			);
 			var  menulist_e = document.getElementById(menulist);
 			if (menulist_e && menuitem) { 
-				dump('Setting default ccs\n');
+				sdump('D_UTIL','Setting default ccs\n');
 				menulist_e.selectedItem = menuitem; 
 			} else {
-				dump('Not Setting default ccs\n');
+				sdump('D_UTIL','Not Setting default ccs\n');
 			}
 		}
 	} else {
-			dump('populate_copy_status_list: Could not find menupopup: ' + menupopup + '\n');
+			sdump('D_UTIL','populate_copy_status_list: Could not find menupopup: ' + menupopup + '\n');
 			throw('populate_copy_status_list: Could not find menupopup: ' + menupopup + '\n');
 	}
 
 }
 
 function populate_copy_location_list(menulist,menupopup,defaultacpl) {
-	dump('populate_copy_location_list\n');
+	sdump('D_UTIL','populate_copy_location_list\n');
 	var popup = document.getElementById(menupopup);
 
 	if (popup) {
@@ -907,7 +920,7 @@ function populate_copy_location_list(menulist,menupopup,defaultacpl) {
 			menuitem.setAttribute('label', mw.G.acpl_my_orgs[i].name()); 
 			menuitem.setAttribute('value', mw.G.acpl_my_orgs[i].id()); 
 			menuitem.setAttribute('id', 'acplitem' + mw.G.acpl_my_orgs[i].id()); 
-			//dump('populate_copy_location_list: i = ' + i + ' acpl_my_orgs = ' + mw.G.acpl_my_orgs[i] + ' = ' + js2JSON(mw.G.acpl_my_orgs[i]) + '\n');
+			//sdump('D_UTIL','populate_copy_location_list: i = ' + i + ' acpl_my_orgs = ' + mw.G.acpl_my_orgs[i] + ' = ' + js2JSON(mw.G.acpl_my_orgs[i]) + '\n');
 			popup.appendChild(menuitem);
 		}
 		var list = document.getElementById(menulist);
@@ -923,14 +936,14 @@ function populate_copy_location_list(menulist,menupopup,defaultacpl) {
 			if (menulist_e && menuitem) { menulist_e.selectedItem = menuitem; }
 		}
 	} else {
-			dump('populate_copy_location_list: Could not find menupopup: ' + menupopup + '\n');
+			sdump('D_UTIL','populate_copy_location_list: Could not find menupopup: ' + menupopup + '\n');
 			throw('populate_copy_location_list: Could not find menupopup: ' + menupopup + '\n');
 	}
 
 }
 
 function populate_lib_list(menulist,menupopup,defaultlib,id_flag) {
-	dump('populate_lib_list\n');
+	sdump('D_UTIL','populate_lib_list\n');
 	var default_menuitem;
 	if (typeof defaultlib == 'object') {
 		defaultlib = defaultlib.id();	
@@ -938,15 +951,15 @@ function populate_lib_list(menulist,menupopup,defaultlib,id_flag) {
 	var popup = menupopup;
 	if (typeof(popup)!='object') { popup = document.getElementById(menupopup); }
 	if (popup) {
-		//dump('found popup\n');
+		//sdump('D_UTIL','found popup\n');
 		empty_widget(popup);
 		var padding_flag = false;
 		for (var ou in mw.G.my_orgs) {
-			//dump('\tlooping on my_orgs:  ' + js2JSON(mw.G.my_orgs[ou]) + '\n');
-			//dump('\tlooping on my_orgs:  ou = ' + ou + '\n');
+			//sdump('D_UTIL','\tlooping on my_orgs:  ' + js2JSON(mw.G.my_orgs[ou]) + '\n');
+			//sdump('D_UTIL','\tlooping on my_orgs:  ou = ' + ou + '\n');
 			var menuitem = document.createElement('menuitem');
 			popup.appendChild(menuitem);
-			//dump('\t\tmenuitem = ' + menuitem + '\n');
+			//sdump('D_UTIL','\t\tmenuitem = ' + menuitem + '\n');
 			var padding = '';
 			//var depth = find_id_object_in_list( mw.G.aout_list, mw.G.my_orgs[ou].ou_type() ).depth();
 			var depth = mw.G.aout_hash[ mw.G.my_orgs[ou].ou_type() ].depth();
@@ -959,26 +972,26 @@ function populate_lib_list(menulist,menupopup,defaultlib,id_flag) {
 			menuitem.setAttribute('label', padding + mw.G.my_orgs[ou].name() );
 			menuitem.setAttribute('value', mw.G.my_orgs[ou].id() );
 			if (id_flag) menuitem.setAttribute('id', 'libitem' + mw.G.my_orgs[ou].id() );
-			//dump('\tname = ' + mw.G.my_orgs[ou].name() + '  id = ' + mw.G.my_orgs[ou].id() + '\n');
+			//sdump('D_UTIL','\tname = ' + mw.G.my_orgs[ou].name() + '  id = ' + mw.G.my_orgs[ou].id() + '\n');
 			if (defaultlib == mw.G.my_orgs[ou].id()) {
 				default_menuitem = menuitem;
-				dump('Setting defaultlib = ' + defaultlib + '\n');
+				sdump('D_UTIL','Setting defaultlib = ' + defaultlib + '\n');
 			}
 		}
 		var list = menulist;
 		if (typeof(list)!='object') { list = document.getElementById(menulist); }
 		if (list && defaultlib && default_menuitem) {
-			//dump('default_menuitem = ' + default_menuitem + '\n');
+			//sdump('D_UTIL','default_menuitem = ' + default_menuitem + '\n');
 			if (list) { list.selectedItem = default_menuitem; }
 		}
 	} else {
-			dump('populate_lib_list: Could not find ' + menupopup + '\n');
+			sdump('D_UTIL','populate_lib_list: Could not find ' + menupopup + '\n');
 			throw('populate_lib_list: Could not find ' + menupopup + '\n');
 	}
 }
 
 function populate_lib_list_with_branch(menulist,menupopup,defaultlib,branch,id_flag) {
-	dump('populate_lib_list_with_branch\n');
+	sdump('D_UTIL','populate_lib_list_with_branch\n');
 	var default_menuitem;
 	if (typeof defaultlib == 'object') {
 		defaultlib = defaultlib.id();	
@@ -989,9 +1002,9 @@ function populate_lib_list_with_branch(menulist,menupopup,defaultlib,branch,id_f
 		empty_widget(popup);
 		var padding_flag = true;
 		var flat_branch = flatten_ou_branch( branch );
-		//dump('\n\nflat_branch = ' + js2JSON(flat_branch) + '\n');
+		//sdump('D_UTIL','\n\nflat_branch = ' + js2JSON(flat_branch) + '\n');
 		for (var i in flat_branch) {
-			//dump('i = ' + js2JSON(i) + ' flat_branch[i] = ' + js2JSON(flat_branch[i]) + '\n');
+			//sdump('D_UTIL','i = ' + js2JSON(i) + ' flat_branch[i] = ' + js2JSON(flat_branch[i]) + '\n');
 			var menuitem = document.createElement('menuitem');
 			var padding = '';
 			//if (flat_branch[i].ou_type().depth() == '0') { padding_flag = true; }
@@ -1006,25 +1019,25 @@ function populate_lib_list_with_branch(menulist,menupopup,defaultlib,branch,id_f
 			if (id_flag) menuitem.setAttribute('id', 'libitem' + flat_branch[i].id() );
 			if (defaultlib == flat_branch[i].id()) {
 				default_menuitem = menuitem;
-				dump('i = ' + i + ' Setting defaultlib = ' + defaultlib + '   menuitem = ' + default_menuitem + '  value = ' + default_menuitem.getAttribute('value') + '\n');
+				sdump('D_UTIL','i = ' + i + ' Setting defaultlib = ' + defaultlib + '   menuitem = ' + default_menuitem + '  value = ' + default_menuitem.getAttribute('value') + '\n');
 			}
 			popup.appendChild(menuitem);
 		}
 		var list = menulist;
 		if (typeof(list)!='object') { list = document.getElementById(menulist); }
 		if (list && defaultlib && default_menuitem) {
-			//dump('default_menuitem = ' + default_menuitem + ' value = ' + default_menuitem.getAttribute('value') + '\n');
+			//sdump('D_UTIL','default_menuitem = ' + default_menuitem + ' value = ' + default_menuitem.getAttribute('value') + '\n');
 			if (list) { list.selectedItem = default_menuitem; }
 		}
 	} else {
-			dump('populate_lib_list_with_branch: Could not find ' + menupopup + '\n');
+			sdump('D_UTIL','populate_lib_list_with_branch: Could not find ' + menupopup + '\n');
 			throw('populate_lib_list_with_branch: Could not find ' + menupopup + '\n');
 	}
-	dump('\tleaving populate_lib_list_with_branch\n');
+	sdump('D_UTIL','\tleaving populate_lib_list_with_branch\n');
 }
 
 function populate_user_profile(menulist,menupopup,defaultap) {
-	dump('Entering populate_user_profile\n');
+	sdump('D_TRACE','Entering populate_user_profile\n');
 	var popup = document.getElementById(menupopup);
 	if (popup) {
 		empty_widget(popup);
@@ -1033,7 +1046,7 @@ function populate_user_profile(menulist,menupopup,defaultap) {
 			menuitem.setAttribute('label', mw.G.ap_list[i].name()); 
 			menuitem.setAttribute('value', mw.G.ap_list[i].id()); 
 			menuitem.setAttribute('id', 'apitem' + mw.G.ap_list[i].id()); 
-			//dump('pop_ap_list: i = ' + i + ' ap = ' + mw.G.ap_list[i] + ' = ' + js2JSON(mw.G.ap_list[i]) + '\n');
+			//sdump('D_UTIL','pop_ap_list: i = ' + i + ' ap = ' + mw.G.ap_list[i] + ' = ' + js2JSON(mw.G.ap_list[i]) + '\n');
 			popup.appendChild(menuitem);
 		}
 		var list = document.getElementById(menulist);
@@ -1049,13 +1062,13 @@ function populate_user_profile(menulist,menupopup,defaultap) {
 			if (menulist_e) { menulist_e.selectedItem = menuitem; }
 		}
 	} else {
-			dump('populate_user_profile: Could not find menupopup: ' + menupopup + '\n');
+			sdump('D_UTIL','populate_user_profile: Could not find menupopup: ' + menupopup + '\n');
 			throw('populate_user_profile: Could not find menupopup: ' + menupopup + '\n');
 	}
 }
 
 function populate_ident_types(menulist,menupopup,repeatid,defaultcit) {
-	dump('Entering populate_ident_types\n');
+	sdump('D_TRACE','Entering populate_ident_types\n');
 	var popup = document.getElementById(menupopup);
 	if (popup) {
 		empty_widget(popup);
@@ -1064,7 +1077,7 @@ function populate_ident_types(menulist,menupopup,repeatid,defaultcit) {
 			menuitem.setAttribute('label', mw.G.cit_list[i].name()); 
 			menuitem.setAttribute('value', mw.G.cit_list[i].id()); 
 			menuitem.setAttribute('id', 'cit' + repeatid + 'item' + mw.G.cit_list[i].id()); 
-			//dump('pop_cit_list: i = ' + i + ' cit = ' + mw.G.cit_list[i] + ' = ' + js2JSON(mw.G.cit_list[i]) + '\n');
+			//sdump('D_UTIL','pop_cit_list: i = ' + i + ' cit = ' + mw.G.cit_list[i] + ' = ' + js2JSON(mw.G.cit_list[i]) + '\n');
 			popup.appendChild(menuitem);
 		}
 		if (list && defaultcit) {
@@ -1079,7 +1092,7 @@ function populate_ident_types(menulist,menupopup,repeatid,defaultcit) {
 			if (menulist_e) { menulist_e.selectedItem = menuitem; }
 		}
 	} else {
-			dump('populate_ident_types: Could not find menupopup: ' + menupopup + '\n');
+			sdump('D_UTIL','populate_ident_types: Could not find menupopup: ' + menupopup + '\n');
 			throw('populate_ident_types: Could not find menupopup: ' + menupopup + '\n');
 	}
 }
@@ -1176,11 +1189,11 @@ function populate_name_prefix(menulist,menupopup,defaultvalue) {
 				list.value = defaultvalue;
 			}
 		} else {
-			dump('populate_name_prefix: Could not find menulist: ' + menulist + '\n');
+			sdump('D_UTIL','populate_name_prefix: Could not find menulist: ' + menulist + '\n');
 			throw('populate_name_prefix: Could not find menulist: ' + menulist + '\n');
 		}
 	} else {
-			dump('populate_name_prefix: Could not find menupopup: ' + menupopup + '\n');
+			sdump('D_UTIL','populate_name_prefix: Could not find menupopup: ' + menupopup + '\n');
 			throw('populate_name_prefix: Could not find menupopup: ' + menupopup + '\n');
 	}
 
@@ -1239,11 +1252,11 @@ function populate_name_suffix(menulist,menupopup,defaultvalue) {
 				list.value = defaultvalue;
 			}
 		} else {
-			dump('populate_name_suffix: Could not find ' + menulist + '\n');
+			sdump('D_UTIL','populate_name_suffix: Could not find ' + menulist + '\n');
 			throw('populate_name_suffix: Could not find ' + menulist + '\n');
 		}
 	} else {
-			dump('populate_name_suffix: Could not find ' + menupopup + '\n');
+			sdump('D_UTIL','populate_name_suffix: Could not find ' + menupopup + '\n');
 			throw('populate_name_suffix: Could not find ' + menupopup + '\n');
 	}
 
diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/util_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/util/util_overlay.xul
index f0b2e94ab8..6b8ee1435d 100644
--- a/Evergreen/staff_client/chrome/content/evergreen/util/util_overlay.xul
+++ b/Evergreen/staff_client/chrome/content/evergreen/util/util_overlay.xul
@@ -26,9 +26,9 @@
 
 	<script src="chrome://evergreen/content/Open-ILS/util/browser.js" />
 
-	<script src="chrome://evergreen/content/widgets/Box.js" />
-	<script src="chrome://evergreen/content/widgets/ListBox.js" />
-	<script src="chrome://evergreen/content/widgets/Survey.js" />
+	<script src="chrome://evergreen/content/Open-ILS/widgets/Box.js" />
+	<script src="chrome://evergreen/content/Open-ILS/widgets/ListBox.js" />
+	<script src="chrome://evergreen/content/Open-ILS/widgets/Survey.js" />
 
 </util>
 
diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/win.js b/Evergreen/staff_client/chrome/content/evergreen/util/win.js
index a319babf1b..b15ba0cb1c 100644
--- a/Evergreen/staff_client/chrome/content/evergreen/util/win.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/util/win.js
@@ -1,4 +1,4 @@
-dump('Loading win.js\n');
+sdump('D_WIN','Loading win.js\n');
 
 function s_alert(s) {
 	// alert() replacement, intended to stop barcode scanners from "scanning through" the dialog
@@ -20,7 +20,7 @@ function s_alert(s) {
 	// the buttons, which are used if BUTTON_TITLE_IS_STRING is assigned to a
 	// particular button. The last two arguments are for an optional check box.
 	var check = {};
-	dump('s_alert: ' + s);
+	sdump('D_WIN','s_alert: ' + s);
 	promptService.confirmEx(window,"ALERT",
 		s,
 		flags, 
@@ -115,7 +115,7 @@ function close_all_windows() {
 }
 
 function spawn_copy_browser(tab,params) {
-	dump('trying to spawn_copy_browser('+js2JSON(params)+')\n');
+	sdump('D_WIN','trying to spawn_copy_browser('+js2JSON(params)+')\n');
 	var w;
 	var chrome = 'chrome://evergreen/content/cat/browse_list.xul';
 	if (tab) {
@@ -129,7 +129,7 @@ function spawn_copy_browser(tab,params) {
 }
 
 function spawn_batch_copy_editor(tab,params) {
-	dump('trying to spawn_copy_editor(' + params + ')');
+	sdump('D_WIN','trying to spawn_copy_editor(' + params + ')');
 	var w;
 	var chrome = 'chrome://evergreen/content/cat/copy_edit.xul';
 	if (tab) {
@@ -142,7 +142,7 @@ function spawn_batch_copy_editor(tab,params) {
 }
 
 function spawn_marc_editor(tab,params) {
-	dump('trying to spawn_marc_editor('+js2JSON(params)+')\n');
+	sdump('D_WIN','trying to spawn_marc_editor('+js2JSON(params)+')\n');
 	var w;
 	var chrome = 'chrome://evergreen/content/cat/marc.xul';
 	if (tab) {
@@ -157,7 +157,7 @@ function spawn_marc_editor(tab,params) {
 }
 
 function spawn_oclc_import(tab,params) {
-	dump('trying to spawn_marc_editor('+js2JSON(params)+')\n');
+	sdump('D_WIN','trying to spawn_marc_editor('+js2JSON(params)+')\n');
 	// sample TCN: 03715963 
 	try {
 		if (params.tcn.length < 6) {
@@ -196,8 +196,8 @@ function spawn_oclc_import(tab,params) {
 }
 
 function spawn_bill_pay(tab,patron,params) {
-	dump('trying to spawn_bill_pay('+js2JSON(patron)+')\n');
-	dump('barcode: ' + patron.barcode() + '\n');
+	sdump('D_WIN','trying to spawn_bill_pay('+js2JSON(patron)+')\n');
+	sdump('D_WIN','barcode: ' + patron.barcode() + '\n');
 	var w;
 	var chrome = 'chrome://evergreen/content/bill/bill.xul';
 	var params = { 'barcode' : patron.barcode() };
@@ -210,8 +210,8 @@ function spawn_bill_pay(tab,patron,params) {
 }
 
 function spawn_check_out(tab,patron,params) {
-	dump('trying to spawn_check_out('+js2JSON(patron)+')\n');
-	dump('barcode: ' + patron.barcode() + '\n');
+	sdump('D_WIN','trying to spawn_check_out('+js2JSON(patron)+')\n');
+	sdump('D_WIN','barcode: ' + patron.barcode() + '\n');
 	var w;
 	var chrome = 'chrome://evergreen/content/circ/checkout.xul';
 	var params = { 'barcode' : patron.barcode() };
@@ -224,8 +224,8 @@ function spawn_check_out(tab,patron,params) {
 }
 
 function spawn_circ_list(tab,patron,params) {
-	dump('trying to spawn_circ_list('+js2JSON(patron)+')\n');
-	dump('barcode: ' + patron.barcode() + '\n');
+	sdump('D_WIN','trying to spawn_circ_list('+js2JSON(patron)+')\n');
+	sdump('D_WIN','barcode: ' + patron.barcode() + '\n');
 	var w;
 	var chrome = 'chrome://evergreen/content/circ/circ_list.xul';
 	var params = { 'barcode' : patron.barcode() };
@@ -238,8 +238,8 @@ function spawn_circ_list(tab,patron,params) {
 }
 
 function spawn_patron_edit(tab,patron,params) {
-	dump('trying to spawn_patron_edit('+js2JSON(patron)+')\n');
-	dump('barcode: ' + patron.barcode() + '\n');
+	sdump('D_WIN','trying to spawn_patron_edit('+js2JSON(patron)+')\n');
+	sdump('D_WIN','barcode: ' + patron.barcode() + '\n');
 	var w;
 	var chrome = 'chrome://evergreen/content/patron/patron_edit.xul';
 	var params = { 'barcode' : patron.barcode() };
diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/xpcom.js b/Evergreen/staff_client/chrome/content/evergreen/util/xpcom.js
index c537bdeb4f..9244080327 100644
--- a/Evergreen/staff_client/chrome/content/evergreen/util/xpcom.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/util/xpcom.js
@@ -1,4 +1,4 @@
-dump('Loading xpcom.js\n');
+sdump('TRACE','Loading xpcom.js\n');
 
 function xp_sound_init() {
 	var SOUNDContractID = "@mozilla.org/sound;1";
@@ -25,7 +25,7 @@ function xp_WebNavigation_init(w) {
 			.getInterface(Components.interfaces.nsIWebNavigation);
 		return webNavigation;
 	} catch(E) {
-	 	dump('WEB NAVIGATION EXCEPTION: ' + js2JSON(e) + '\n');
+	 	sdump('TRACE','WEB NAVIGATION EXCEPTION: ' + js2JSON(e) + '\n');
 	}
 }
 
-- 
2.11.0