From 51d81230947d067dcfa91143051cdc2a59aab470 Mon Sep 17 00:00:00 2001
From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Sat, 18 Jun 2005 06:25:08 +0000
Subject: [PATCH] some refactoring

git-svn-id: svn://svn.open-ils.org/ILS/trunk@847 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 .../chrome/content/evergreen/util/error.js    |  35 ++
 .../chrome/content/evergreen/util/fm_utils.js |  90 ++++
 .../content/evergreen/util/functional.js      |  80 +++
 .../chrome/content/evergreen/util/util.js     | 497 ------------------
 .../content/evergreen/util/util_overlay.xul   |   7 +-
 .../chrome/content/evergreen/util/validate.js |  54 ++
 .../chrome/content/evergreen/util/widgets.js  | 286 ++++++++++
 7 files changed, 551 insertions(+), 498 deletions(-)
 create mode 100644 Evergreen/staff_client/chrome/content/evergreen/util/error.js
 create mode 100644 Evergreen/staff_client/chrome/content/evergreen/util/fm_utils.js
 create mode 100644 Evergreen/staff_client/chrome/content/evergreen/util/functional.js
 create mode 100644 Evergreen/staff_client/chrome/content/evergreen/util/validate.js
 create mode 100644 Evergreen/staff_client/chrome/content/evergreen/util/widgets.js

diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/error.js b/Evergreen/staff_client/chrome/content/evergreen/util/error.js
new file mode 100644
index 0000000000..ca02b74ef2
--- /dev/null
+++ b/Evergreen/staff_client/chrome/content/evergreen/util/error.js
@@ -0,0 +1,35 @@
+sdump('D_TRACE',"Loading error.js\n");
+
+var sdump_levels = {
+	'D_TRACE' :  true,
+	'D_AUTH' : false,
+	'D_UTIL' : false,
+	'D_EXPLODE' : false,
+	'D_PRINT' : false,
+	'D_SES' : true
+};
+
+function sdump(level,msg) {
+	try {
+		if (sdump_levels[level])
+			debug(msg);
+	} catch(E) {}
+}
+
+function handle_error(E) {
+	var s = '';
+	if (instanceOf(E,ex)) {
+		s += E.err_msg();
+		//s += '\n\n=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n';
+		//s += 'This error was anticipated.\n\n';
+		//s += js2JSON(E).substr(0,200) + '...\n\n';
+		if (snd_bad) snd_bad();
+	} else {
+		s += '\n\n=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n';
+		s += 'This is a bug that we will fix later.\n\n';
+		s += js2JSON(E).substr(0,200) + '\n\n';
+		if (snd_really_bad) snd_really_bad();
+	}
+	s_alert(s);
+}
+
diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/fm_utils.js b/Evergreen/staff_client/chrome/content/evergreen/util/fm_utils.js
new file mode 100644
index 0000000000..9656ed5dea
--- /dev/null
+++ b/Evergreen/staff_client/chrome/content/evergreen/util/fm_utils.js
@@ -0,0 +1,90 @@
+sdump('D_TRACE','Loading fm_utils.js\n');
+
+function get_my_orgs(user_ou) {
+
+	// self and ancestors
+	var current_item_id = user_ou.id();
+	//sdump('D_FM_UTILS','mw.G[user_ou] = ' + js2JSON(mw.G['user_ou']) + '\n');
+	//sdump('D_FM_UTILS','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) ) {
+		//sdump('D_FM_UTILS','\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();
+	//sdump('D_FM_UTILS','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 {
+		sdump('D_FM_UTILS','ERROR: find_ou(org_tree,'+current_item_id+') returned with no properties\n');
+	};
+	//sdump('D_FM_UTILS','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;
+			//sdump('D_FM_UTILS','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];
+					my_orgs[ my_gchild.id() ] = my_gchild;
+                        	}
+			}
+                }
+        }
+	//sdump('D_FM_UTILS','& descendants : my_orgs = <<<'+js2JSON(my_orgs)+'>>>\n');
+	return my_orgs;
+}
+
+function get_other_orgs(org,other_orgs) {
+}
+
+function flatten_ou_branch(branch) {
+	//sdump('D_FM_UTILS','flatten: branch = ' + js2JSON(branch) + '\n');
+	var my_array = new Array();
+	my_array.push( branch );
+	for (var i in branch.children() ) {
+		var child = branch.children()[i];
+		if (child != null) {
+			var temp_array = flatten_ou_branch(child);
+			for (var j in temp_array) {
+				my_array.push( temp_array[j] );
+			}
+		}
+	}
+	return my_array;
+}
+
+function find_ou(tree,id) {
+	if (typeof(id)=='object') { id = id.id(); }
+	if (tree.id()==id) {
+		return tree;
+	}
+	for (var i in tree.children()) {
+		var child = tree.children()[i];
+		ou = find_ou( child, id );
+		if (ou) { return ou; }
+	}
+	return null;
+}
+
+function find_ou_by_shortname(tree,sn) {
+	var ou = new aou();
+	if (tree.shortname()==sn) {
+		return tree;
+	}
+	for (var i in tree.children()) {
+		var child = tree.children()[i];
+		ou = find_ou_by_shortname( child, sn );
+		if (ou) { return ou; }
+	}
+	return null;
+}
+
+
diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/functional.js b/Evergreen/staff_client/chrome/content/evergreen/util/functional.js
new file mode 100644
index 0000000000..ff99b27e7b
--- /dev/null
+++ b/Evergreen/staff_client/chrome/content/evergreen/util/functional.js
@@ -0,0 +1,80 @@
+sdump('D_FUNCTIONAL',"Loading functional.js\n");
+
+function filter_list(list,f) {
+	var new_list = [];
+	for (var i in list) {
+		var t = f( list[i] );
+		if (t) new_list.push( list[i] );
+	}
+	return new_list;
+}
+
+function find_list(list,f) {
+	for (var i in list) {
+		var t = f( list[i] );
+		if (t) return list[i];
+	}
+	return null;
+}
+
+function map_list(list,f) {
+	var new_list = [];
+	for (var i in list) {
+		new_list.push( f( list[i] ) );
+	}
+	return new_list;
+}
+
+function map_object_to_list(obj,f) {
+	var new_list = [];
+	for (var i in obj) {
+		new_list.push( f( obj, i ) );
+	}
+	return new_list;
+}
+
+function convert_object_list_to_hash(list) {
+	var my_hash = new Object();
+	if (list) {
+		for (var i = 0; i < list.length; i++) {
+			my_hash[ list[i].id() ] = list[i];
+		}
+	}
+	return my_hash;
+}
+
+function find_id_object_in_list(list,id) {
+	//sdump('D_FUNCTIONAL','find_id_object_in_list(' + js2JSON(list).substr(0,20) + '... ,' + id + ')\n');
+	if (list) {
+		for (var i = 0; i < list.length; i++ ) {
+			try {
+				if ( list[i].id() == id ) {
+					return list[i];
+				}
+			} catch(E) {
+				sdump('D_FUNCTIONAL','find_id_object_in_list error, i = ' + i + '  typeof(list[i]) = ' + typeof(list[i]) + '  list[i] = ' + js2JSON(list[i]) + ' : ' + js2JSON(E) + '\n');
+			}
+		}
+	}
+	//sdump('D_FUNCTIONAL','not found\n');
+	return null;
+}
+
+function find_attr_object_in_list(list,attr,value) {
+	if (list) {
+		for (var i = 0; i < list.length; i++ ) {
+			sdump('D_FUNCTIONAL','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) {
+				sdump('D_FUNCTIONAL','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');
+			}
+		}
+	}
+	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 f9c987a5d3..876d9fe718 100644
--- a/Evergreen/staff_client/chrome/content/evergreen/util/util.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/util/util.js
@@ -2,40 +2,6 @@ sdump('D_TRACE','Loading util.js\n');
 
 var timer = {};
 var counter = {};
-var treeitem_id = 0;
-
-var sdump_levels = {
-	'D_TRACE' :  true,
-	'D_AUTH' : false,
-	'D_UTIL' : false,
-	'D_EXPLODE' : false,
-	'D_PRINT' : false,
-	'D_SES' : true
-};
-
-function sdump(level,msg) {
-	try {
-		if (sdump_levels[level])
-			debug(msg);
-	} catch(E) {}
-}
-
-function handle_error(E) {
-	var s = '';
-	if (instanceOf(E,ex)) {
-		s += E.err_msg();
-		//s += '\n\n=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n';
-		//s += 'This error was anticipated.\n\n';
-		//s += js2JSON(E).substr(0,200) + '...\n\n';
-		snd_bad()
-	} else {
-		s += '\n\n=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\n\n';
-		s += 'This is a bug that we will fix later.\n\n';
-		s += js2JSON(E).substr(0,200) + '\n\n';
-		snd_really_bad();
-	}
-	s_alert(s);
-}
 
 function string_to_array(s) {
 	var my_array = [];
@@ -45,112 +11,6 @@ function string_to_array(s) {
 	return my_array;
 }
 
-function textbox_checkdigit(ev) {
-	if ( check_checkdigit( ev.target.value ) ) {
-		sdump('D_UTIL', 'success\n');
-		return true;
-	} else {
-		sdump('D_UTIL', 'failure\n');
-		ev.preventDefault();
-		ev.stopPropagation();
-		return false;
-	}
-}
-
-function check_checkdigit(barcode) {
-
-	var stripped_barcode = barcode.slice(0,-1);
-	var checkdigit = barcode.slice(-1);
-
-	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();
-	sdump('D_UTIL', '\tb_array = ' + b_array + '\n');
-
-	for (var i in b_array) {
-		var digit = parseInt( b_array[i] );
-		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() );
-		sdump('D_UTIL', '\t\tp_array = ' + p_array + '\n');
-
-		for (var j in p_array) { 
-			var n = parseInt( p_array[j] );
-			sdump('D_UTIL', '\t\t\tn = ' + n + '\n');
-			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;
-	sdump('D_UTIL', '\tcalculated checkdigit = ' + calculated_checkdigit + '\n\n=-=***=-=\n\n');
-
-	return ( calculated_checkdigit == checkdigit );
-}
-
-function fake_tab_for_textboxes(w,current) {
-	var flag = false; var next_one;
-	if (typeof(w)!='object') {
-		w = document.getElementById(w);
-	}
-	sdump('D_UTIL', 'fake_tab_for_textboxes: Current ' + current + '\n');
-	var nl = w.getElementsByTagName('textbox');
-	//var nl = document.getElementsByTagName('textbox');
-	sdump('D_UTIL', 'fake_tab_for_textboxes: nl.length = ' + nl.length + '\n');
-	for (var i = 0; i < nl.length; i++) {
-		sdump('D_UTIL', 'fake_tab_for_textboxes: Considering ' + nl[i] + '...\n');
-		if (flag && !next_one) {
-			sdump('D_UTIL', 'fake_tab_for_textboxes: Setting next_one ' + nl[i] + '\n');	
-			next_one = nl[i];
-		}
-		if (nl[i] === current) {
-			sdump('D_UTIL','fake_tab_for_textboxes: Found current\n');
-			flag = true;
-		}
-	}
-	if (!next_one) {
-		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 {
-		sdump('D_UTIL','fake_tab_for_textboxes: next_one not set\n');
-	}
-}
-
-function get_list_from_tree_selection(tree_w) {
-	sdump('D_UTIL','entering get_list_from_tree...\n');
-	var hitlist;
-	if (typeof(tree_w) != 'object') {
-		hitlist = document.getElementById(tree_w);
-	} else {
-		hitlist = tree_w;
-	}
-	var list = [];
-	var start = new Object();
-	var end = new Object();
-	var numRanges = hitlist.view.selection.getRangeCount();
-	for (var t=0; t<numRanges; t++){
-		hitlist.view.selection.getRangeAt(t,start,end);
-		for (var v=start.value; v<=end.value; v++){
-			var i = hitlist.contentView.getItemAtIndex(v);
-			//sdump('D_UTIL',i.tagName + '\n');
-			list.push( i );
-		}
-	}
-	sdump('D_UTIL','leaving get_list_from_tree...\n');
-	return list;
-}
-
 function yesno(value) {
 	switch(value) {
 		case true: case 'true': case '1': case 'on':
@@ -296,186 +156,6 @@ function pretty_print(s) {
 	return r;
 }
 
-function enable_widgets() {
-	for (var i = 0; i < arguments.length; i++) {
-		if (typeof(arguments[i]) == 'object') {
-			sdump('D_UTIL',arguments[i] + '.disabled = false;\n');
-			arguments[i].disabled = false;
-		} else {
-			var w = document.getElementById( arguments[i] );
-			if (w) { 
-				sdump('D_UTIL',w + '.disabled = false;\n');
-				w.disabled = false; 
-			}
-		}
-	}
-}
-
-function disable_widgets() {
-	for (var i = 0; i < arguments.length; i++) {
-		if (typeof(arguments[i]) == 'object') {
-			sdump('D_UTIL',arguments[i] + '.disabled = true;\n');
-			arguments[i].disabled = true;
-		} else {
-			var w = document.getElementById( arguments[i] );
-			if (w) { 
-				sdump('D_UTIL',w + '.disabled = true;\n');
-				w.disabled = true; 
-			}
-		}
-	}
-}
-
-function focus_widget(e) {
-	if (typeof(e) == 'object') {
-		e.focus();
-	} else {
-		var w = document.getElementById(e);
-		if (w) { w.focus(); }
-	}
-}
-
-function empty_widget(e) {
-	if (typeof(e) != 'object') { e = document.getElementById(e); }
-	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') { 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]);
-	}
-}
-
-function swap_attributes(e,a1,a2) {
-	if (typeof(e) != 'object') { e = document.getElementById(e); }
-	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);
-	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) {
-	try {
-		if (typeof(e) != 'object') { e = document.getElementById(e); }
-		if (typeof(e) != 'object') { throw('typeof e != object : typeof e = ' + typeof(e)); }
-		if (!a) { throw('!a : a = ' + a); }
-		if (! e.getAttribute(a) ) { throw(' ! e.getAttribute(a) : a = ' + a); }
-		if (typeof(v) != 'object') { throw('typeof v != object : typeof v = ' + typeof(v)); }
-
-		var toggle = e.getAttribute(a);
-		var next_one = false;
-		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]);
-				sdump('D_UTIL',v[i] + '\n');
-				return v[i];
-			}
-			if (toggle == v[i]) {
-				next_one = true;
-			}
-		}
-		if (next_one) {
-			e.setAttribute(a,v[0]);
-			sdump('D_UTIL',v[0] + '\n');
-			return v[0];
-		} else {
-			throw('current value not in list');
-		}
-	} catch(E) {
-		sdump('D_UTIL','cycle_attribute error: ' + js2JSON(E) + '\n');
-		sdump('D_UTIL','null\n');
-		return null;
-	}
-}
-
-
-function radio_checkbox(ev) {
-	var target = ev.target;
-	var group = target.getAttribute('group');
-	if (group) {
-		var nl = document.getElementsByTagName('checkbox');
-		for (var i in nl) {
-			if (typeof(nl[i])=='object') {
-				var c = nl[i];
-				var cgroup = c.getAttribute('group');
-				if (cgroup == group) {
-					c.checked = false;
-				}
-                        }
-                }
-		target.checked = true;
-	} else {
-		sdump('D_UTIL','radio_checkbox: Checkbox must have a group attribute to find peers');
-	}
-}
-
-function toggle_hidden_grid_rows(grid) {
-	if (typeof(grid) != 'object') {
-		grid = document.getElementById(grid);
-	}
-	if (!grid) { return; }
-	var rows = grid.lastChild; if (!rows) { return; }
-	for (var r = 0; r < rows.childNodes.length; r++ ) {
-		var row = rows.childNodes[r];
-		if (typeof(row) == 'object') {
-			//sdump('D_UTIL','toggle row = ' + row + '\n');
-			var hidden = row.getAttribute('hidden');
-			if (hidden == 'true') {
-				row.setAttribute('hidden','false');
-			} else {
-				row.setAttribute('hidden','true');
-			}
-		}
-	}
-}
-
-/* The first parameter is the id of the element to set, or an array of ids for elements to set in batch.  The second parameter is an object containing the attribute/value pairs to assign to the element or elements */
-function xul_setAttributes(el,attrs) {
-	if (typeof(el) == 'object') {
-		for (var e in el) {
-			var w = document.getElementById(e);
-			for (var a in attrs) {
-				w.setAttribute(a,attrs[a]);
-			}
-		}
-	} else {
-		var w = document.getElementById(el);
-		for (var a in attrs) {
-			w.setAttribute(a,attrs[a]);
-		}
-	}
-}
-
-function append_treeitem() {
-	var id = arguments[0];
-	var treechildren = document.getElementById(id);
-	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);
-		//sdump('D_UTIL','treecell.label = ' + arguments[i] + '\n');
-	}
-	return treeitem_id++;
-}
-
-function set_decks(params) {
-	for (var deck_id in params) {
-		var deck = document.getElementById( deck_id )
-		if (deck) deck.setAttribute( 'selectedIndex', params[deck_id] );
-	}
-}
-
 function super_dump(o,t) {
 	var s = "\n";
 	for (var ii = 0; ii < t; ii++) { s = s + '\t'; }
@@ -536,181 +216,4 @@ function super_dump_norecurse(o,t) {
 	}
 }
 
-function get_my_orgs(user_ou) {
-
-	// self and ancestors
-	var current_item_id = user_ou.id();
-	//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) ) {
-		//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();
-	//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 {
-		sdump('D_UTIL','ERROR: find_ou(org_tree,'+current_item_id+') returned with no properties\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;
-			//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];
-					my_orgs[ my_gchild.id() ] = my_gchild;
-                        	}
-			}
-                }
-        }
-	//sdump('D_UTIL','& descendants : my_orgs = <<<'+js2JSON(my_orgs)+'>>>\n');
-	return my_orgs;
-}
-
-function get_other_orgs(org,other_orgs) {
-}
-
-function flatten_ou_branch(branch) {
-	//sdump('D_UTIL','flatten: branch = ' + js2JSON(branch) + '\n');
-	var my_array = new Array();
-	my_array.push( branch );
-	for (var i in branch.children() ) {
-		var child = branch.children()[i];
-		if (child != null) {
-			var temp_array = flatten_ou_branch(child);
-			for (var j in temp_array) {
-				my_array.push( temp_array[j] );
-			}
-		}
-	}
-	return my_array;
-}
-
-function find_ou(tree,id) {
-	if (typeof(id)=='object') { id = id.id(); }
-	if (tree.id()==id) {
-		return tree;
-	}
-	for (var i in tree.children()) {
-		var child = tree.children()[i];
-		ou = find_ou( child, id );
-		if (ou) { return ou; }
-	}
-	return null;
-}
-
-function find_tree_via_children(tree,children_func,find_func) {
-	if (typeof(tree)!='object') tree = document.getElementById(tree);
-
-	var t = find_func(tree); if (t) return t;
-
-	var c = children_func(tree);
-
-	for (var i = 0; i < c.length; i++) {
-		t = find_func( c[i] );
-		if (t) return t;
-	}
-}
-
-function filter_list(list,f) {
-	var new_list = [];
-	for (var i in list) {
-		var t = f( list[i] );
-		if (t) new_list.push( list[i] );
-	}
-	return new_list;
-}
-
-function find_list(list,f) {
-	for (var i in list) {
-		var t = f( list[i] );
-		if (t) return list[i];
-	}
-	return null;
-}
-
-function map_list(list,f) {
-	var new_list = [];
-	for (var i in list) {
-		new_list.push( f( list[i] ) );
-	}
-	return new_list;
-}
-
-function map_object_to_list(obj,f) {
-	var new_list = [];
-	for (var i in obj) {
-		new_list.push( f( obj, i ) );
-	}
-	return new_list;
-}
-
-function convert_object_list_to_hash(list) {
-	var my_hash = new Object();
-	if (list) {
-		for (var i = 0; i < list.length; i++) {
-			my_hash[ list[i].id() ] = list[i];
-		}
-	}
-	return my_hash;
-}
-
-function find_id_object_in_list(list,id) {
-	//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 {
-				if ( list[i].id() == id ) {
-					return list[i];
-				}
-			} catch(E) {
-				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');
-			}
-		}
-	}
-	//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++ ) {
-			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) {
-				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');
-			}
-		}
-	}
-	return null;
-}
-
-function find_ou_by_shortname(tree,sn) {
-	var ou = new aou();
-	if (tree.shortname()==sn) {
-		return tree;
-	}
-	for (var i in tree.children()) {
-		var child = tree.children()[i];
-		ou = find_ou_by_shortname( child, sn );
-		if (ou) { return ou; }
-	}
-	return null;
-}
-
 
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 ae559e6d9a..4e27a97f26 100644
--- a/Evergreen/staff_client/chrome/content/evergreen/util/util_overlay.xul
+++ b/Evergreen/staff_client/chrome/content/evergreen/util/util_overlay.xul
@@ -11,11 +11,16 @@
 	</script>
 
 	<script src="util.js" />	<!-- miscellaneous scripts.  want to make this empty -->
+	<script src="functional.js" />	<!-- neat use of first-class functions, and some predecessors -->
+	<script src="fm_utils.js" />	<!-- some convenience functions for fieldmapper objects -->
+	<script src="error.js" />	<!-- more like output handling -->
+	<script src="validate.js" />	<!-- some validation functions -->
+	<script src="widgets.js" />	<!-- some convenience functions for XUL/HTML elements.  want to eliminate overlap with webutils -->
 	<script src="populate.js" />	<!-- populate widgets (like menus) with values -->
 	<script src="fieldmapper.js" /> <!-- our Objects for things like patrons, books, etc.  This is generated. -->
 	<script src="OrgTree.js" />	<!-- our Organization Hierarchy.  This is generated. -->
 
-	<script src="chrome://evergreen/content/Open-ILS/util/webutils.js" />		<!-- Bill's grab bag of useful functions.  want to elminate overlap -->
+	<script src="chrome://evergreen/content/Open-ILS/util/webutils.js" />		<!-- Bill's grab bag of useful functions.  want to eliminate overlap -->
 	<script src="chrome://evergreen/content/Open-ILS/util/RemoteRequest.js" />	<!-- XMLHttpRequest -->
 	<script src="chrome://evergreen/content/Open-ILS/util/ex.js" />			<!-- error/exception handling -->
 
diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/validate.js b/Evergreen/staff_client/chrome/content/evergreen/util/validate.js
new file mode 100644
index 0000000000..1e879de0ba
--- /dev/null
+++ b/Evergreen/staff_client/chrome/content/evergreen/util/validate.js
@@ -0,0 +1,54 @@
+sdump('D_TRACE',"Loading validate.js\n");
+
+function textbox_checkdigit(ev) {
+	if ( check_checkdigit( ev.target.value ) ) {
+		sdump('D_VALIDATE', 'success\n');
+		return true;
+	} else {
+		sdump('D_VALIDATE', 'failure\n');
+		ev.preventDefault();
+		ev.stopPropagation();
+		return false;
+	}
+}
+
+function check_checkdigit(barcode) {
+
+	var stripped_barcode = barcode.slice(0,-1);
+	var checkdigit = barcode.slice(-1);
+
+	sdump('D_VALIDATE', '\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();
+	sdump('D_VALIDATE', '\tb_array = ' + b_array + '\n');
+
+	for (var i in b_array) {
+		var digit = parseInt( b_array[i] );
+		sdump('D_VALIDATE', '\t\tdigit = ' + digit + '\n');
+
+		var product = digit * mul;
+		if (mul == 2) { mul = 1; } else { mul = 2; }
+
+		var p_array = string_to_array( product.toString() );
+		sdump('D_VALIDATE', '\t\tp_array = ' + p_array + '\n');
+
+		for (var j in p_array) { 
+			var n = parseInt( p_array[j] );
+			sdump('D_VALIDATE', '\t\t\tn = ' + n + '\n');
+			sum += n;
+		}
+	}
+
+	sdump('D_VALIDATE', '\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;
+	sdump('D_VALIDATE', '\tcalculated checkdigit = ' + calculated_checkdigit + '\n\n=-=***=-=\n\n');
+
+	return ( calculated_checkdigit == checkdigit );
+}
+
+
diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/widgets.js b/Evergreen/staff_client/chrome/content/evergreen/util/widgets.js
new file mode 100644
index 0000000000..7ee2bce387
--- /dev/null
+++ b/Evergreen/staff_client/chrome/content/evergreen/util/widgets.js
@@ -0,0 +1,286 @@
+sdump('D_WIDGETS',"Loading widgets.js\n");
+
+// This was originally used in circ.js for checkin and checkout lists.
+// The first argument is the treechildren element for the tree.
+// Subsequent arguments are treated as textual values for treecells in that treeitem.
+var treeitem_id = 0;
+function append_treeitem() {
+	var e = arguments[0];
+	if (typeof(e) != 'object') { e = document.getElementById(e); }
+	if (typeof(e) != 'object') { throw('typeof e != object : typeof e = ' + typeof(e)); }
+	var treechildren = e;
+
+	if (!treechildren) { sdump('D_WIDGETS','No ' + id + ' to append to\n'); return; }
+
+	var treeitem = elem('treeitem'); treechildren.appendChild(treeitem);
+	var treerow = elem('treerow'); treeitem.appendChild(treerow);
+	for (var i = 1; i < arguments.length ; i++ ) {
+		var treecell = elem(
+			'treecell',
+			{ 'label': arguments[i], 'id' : 'treeitem_' + treeitem_id + '_' + i }
+		);
+		treerow.appendChild(treecell);
+		//sdump('D_WIDGETS','treecell.label = ' + arguments[i] + '\n');
+	}
+	return treeitem_id++;
+}
+
+// This was used in browse_list.js as a more flexible alternative to swap_attribute.
+// The first argument is the element, the second argument is the pertinant attribute,
+// and the third argument is an array of values to cycle through for setting the
+// element's attribute.  Ex: var toggle = cycle_attribute( target,'toggle',['1','2','3'] );
+function cycle_attribute(e,a,v) {
+	try {
+		if (typeof(e) != 'object') { e = document.getElementById(e); }
+		if (typeof(e) != 'object') { throw('typeof e != object : typeof e = ' + typeof(e)); }
+		if (!a) { throw('!a : a = ' + a); }
+		if (! e.getAttribute(a) ) { throw(' ! e.getAttribute(a) : a = ' + a); }
+		if (typeof(v) != 'object') { throw('typeof v != object : typeof v = ' + typeof(v)); }
+
+		var toggle = e.getAttribute(a);
+		var next_one = false;
+		sdump('D_WIDGETS','cycling ' + a + ' on ' + e.getAttribute('id') + ' to ');
+		for (var i = 0; i < v.length; i++) {
+			if (next_one) {
+				e.setAttribute(a,v[i]);
+				sdump('D_WIDGETS',v[i] + '\n');
+				return v[i];
+			}
+			if (toggle == v[i]) {
+				next_one = true;
+			}
+		}
+		if (next_one) {
+			e.setAttribute(a,v[0]);
+			sdump('D_WIDGETS',v[0] + '\n');
+			return v[0];
+		} else {
+			throw('current value not in list');
+		}
+	} catch(E) {
+		sdump('D_WIDGETS','cycle_attribute error: ' + js2JSON(E) + '\n');
+		sdump('D_WIDGETS','null\n');
+		return null;
+	}
+}
+
+// Treats each argument as an element to disable 
+function disable_widgets() {
+	for (var i = 0; i < arguments.length; i++) {
+		if (typeof(arguments[i]) == 'object') {
+			sdump('D_WIDGETS',arguments[i] + '.disabled = true;\n');
+			arguments[i].disabled = true;
+		} else {
+			var w = document.getElementById( arguments[i] );
+			if (w) { 
+				sdump('D_WIDGETS',w + '.disabled = true;\n');
+				w.disabled = true; 
+			}
+		}
+	}
+}
+
+// removes listitems from listboxes
+function empty_listbox(e) {
+	if (typeof(e) != 'object') { e = document.getElementById(e); }
+	if (typeof(e) != 'object') { sdump('D_WIDGETS','Failed on empty_listbox\n'); return; }
+	var nl = e.getElementsByTagName('listitem');
+	for (var i = 0; i < nl.length; i++) {
+		e.removeChild(nl[i]);
+	}
+}
+
+// removes all of an element's children
+function empty_widget(e) {
+	if (typeof(e) != 'object') { e = document.getElementById(e); }
+	if (typeof(e) != 'object') { sdump('D_WIDGETS','Failed on empty_widget\n'); return; }
+	while (e.lastChild) { e.removeChild(e.lastChild); }
+}
+
+
+// Treats each argument as an element to enable 
+function enable_widgets() {
+	for (var i = 0; i < arguments.length; i++) {
+		if (typeof(arguments[i]) == 'object') {
+			sdump('D_WIDGETS',arguments[i] + '.disabled = false;\n');
+			arguments[i].disabled = false;
+		} else {
+			var w = document.getElementById( arguments[i] );
+			if (w) { 
+				sdump('D_WIDGETS',w + '.disabled = false;\n');
+				w.disabled = false; 
+			}
+		}
+	}
+}
+
+// Originally used in volume.js after intercepting Enter presses on the keyboard.
+// The first argument is the element to search for textboxes, and the second
+// argument is the current textbox.  This function finds the next textbox and
+// gives it focus.
+function fake_tab_for_textboxes(w,current) {
+	var flag = false; var next_one;
+	if (typeof(w)!='object') {
+		w = document.getElementById(w);
+	}
+	sdump('D_WIDGETS', 'fake_tab_for_textboxes: Current ' + current + '\n');
+	var nl = w.getElementsByTagName('textbox');
+	//var nl = document.getElementsByTagName('textbox');
+	sdump('D_WIDGETS', 'fake_tab_for_textboxes: nl.length = ' + nl.length + '\n');
+	for (var i = 0; i < nl.length; i++) {
+		sdump('D_WIDGETS', 'fake_tab_for_textboxes: Considering ' + nl[i] + '...\n');
+		if (flag && !next_one) {
+			sdump('D_WIDGETS', 'fake_tab_for_textboxes: Setting next_one ' + nl[i] + '\n');	
+			next_one = nl[i];
+		}
+		if (nl[i] === current) {
+			sdump('D_WIDGETS','fake_tab_for_textboxes: Found current\n');
+			flag = true;
+		}
+	}
+	if (!next_one) {
+		sdump('D_WIDGETS','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 {
+		sdump('D_WIDGETS','fake_tab_for_textboxes: next_one not set\n');
+	}
+}
+
+
+// Not actually used anywhere.  I'm not sure what this is :D
+// Ah, looks like it could handle XUL trees and fieldmapper trees
+// Ex. find( org_tree, function(o){return o.children();}, function(o){return (o.id == 'the winner');})
+function find_tree_via_children(tree,children_func,find_func) {
+	if (typeof(tree)!='object') tree = document.getElementById(tree);
+
+	var t = find_func(tree); if (t) return t;
+
+	var c = children_func(tree);
+
+	for (var i = 0; i < c.length; i++) {
+		t = find_func( c[i] );
+		if (t) return t;
+	}
+}
+
+
+// Give this element focus
+function focus_widget(e) {
+	if (typeof(e) == 'object') {
+		e.focus();
+	} else {
+		var w = document.getElementById(e);
+		if (w) { w.focus(); }
+	}
+}
+
+// Returns a list of selected treeitems from the specified tree
+function get_list_from_tree_selection(tree_w) {
+	sdump('D_WIDGETS','entering get_list_from_tree...\n');
+	var hitlist;
+	if (typeof(tree_w) != 'object') {
+		hitlist = document.getElementById(tree_w);
+	} else {
+		hitlist = tree_w;
+	}
+	var list = [];
+	var start = new Object();
+	var end = new Object();
+	var numRanges = hitlist.view.selection.getRangeCount();
+	for (var t=0; t<numRanges; t++){
+		hitlist.view.selection.getRangeAt(t,start,end);
+		for (var v=start.value; v<=end.value; v++){
+			var i = hitlist.contentView.getItemAtIndex(v);
+			//sdump('D_WIDGETS',i.tagName + '\n');
+			list.push( i );
+		}
+	}
+	sdump('D_WIDGETS','leaving get_list_from_tree...\n');
+	return list;
+}
+
+// Simulates radio buttons with checkboxes.  Include this in command event listeners
+// for the pertinent textboxes.  For any set of checkboxes that have the same 'group'
+// attribute, only one can be checked at a time.
+function radio_checkbox(ev) {
+	var target = ev.target;
+	var group = target.getAttribute('group');
+	if (group) {
+		var nl = document.getElementsByTagName('checkbox');
+		for (var i in nl) {
+			if (typeof(nl[i])=='object') {
+				var c = nl[i];
+				var cgroup = c.getAttribute('group');
+				if (cgroup == group) {
+					c.checked = false;
+				}
+                        }
+                }
+		target.checked = true;
+	} else {
+		sdump('D_WIDGETS','radio_checkbox: Checkbox must have a group attribute to find peers');
+	}
+}
+
+// Takes a hash with key:value => deck element id : page index
+// Sets each deck to the corresponding index
+function set_decks(params) {
+	for (var deck_id in params) {
+		var deck = document.getElementById( deck_id )
+		if (deck) deck.setAttribute( 'selectedIndex', params[deck_id] );
+	}
+}
+
+// swaps the values of two attributes for an element
+function swap_attributes(e,a1,a2) {
+	if (typeof(e) != 'object') { e = document.getElementById(e); }
+	if (typeof(e) != 'object') { sdump('D_WIDGETS','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);
+	sdump('D_WIDGETS','before: a1 = ' + a1_v + ' a2 = ' + a2_v + ' and ');
+	sdump('D_WIDGETS','after: a1 = ' + a2_v + ' a2 = ' + a1_v + '\n');
+}
+
+// Flips the hidden value for each row in a grid
+function toggle_hidden_grid_rows(grid) {
+	if (typeof(grid) != 'object') {
+		grid = document.getElementById(grid);
+	}
+	if (!grid) { return; }
+	var rows = grid.lastChild; if (!rows) { return; }
+	for (var r = 0; r < rows.childNodes.length; r++ ) {
+		var row = rows.childNodes[r];
+		if (typeof(row) == 'object') {
+			//sdump('D_WIDGETS','toggle row = ' + row + '\n');
+			var hidden = row.getAttribute('hidden');
+			if (hidden == 'true') {
+				row.setAttribute('hidden','false');
+			} else {
+				row.setAttribute('hidden','true');
+			}
+		}
+	}
+}
+
+/* The first parameter is the id of the element to set, or an array of ids for elements to set in batch.  The second parameter is an object containing the attribute/value pairs to assign to the element or elements */
+function xul_setAttributes(el,attrs) {
+	if (typeof(el) == 'object') {
+		for (var e in el) {
+			var w = document.getElementById(e);
+			for (var a in attrs) {
+				w.setAttribute(a,attrs[a]);
+			}
+		}
+	} else {
+		var w = document.getElementById(el);
+		for (var a in attrs) {
+			w.setAttribute(a,attrs[a]);
+		}
+	}
+}
+
-- 
2.43.2