From eef8d68854a080c3494195ec1ad8b254a36350ac Mon Sep 17 00:00:00 2001
From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Wed, 14 Dec 2005 21:16:11 +0000
Subject: [PATCH] refactor

git-svn-id: svn://svn.open-ils.org/ILS/trunk@2380 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 .../xul/staff_client/server/circ/checkin.js   |  8 ++------
 .../xul/staff_client/server/circ/checkout.js  |  8 ++------
 Open-ILS/xul/staff_client/server/circ/util.js | 19 +++++++++++++++++++
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/Open-ILS/xul/staff_client/server/circ/checkin.js b/Open-ILS/xul/staff_client/server/circ/checkin.js
index a5d25525ca..d74597280e 100644
--- a/Open-ILS/xul/staff_client/server/circ/checkin.js
+++ b/Open-ILS/xul/staff_client/server/circ/checkin.js
@@ -5,6 +5,7 @@ circ.checkin = function (params) {
 
 	JSAN.use('util.error'); this.error = new util.error();
 	JSAN.use('util.network'); this.network = new util.network();
+	this.OpenILS = {}; JSAN.use('OpenILS.data'); this.OpenILS.data = new OpenILS.data(); this.OpenILS.data.init({'via':'stash'});
 }
 
 circ.checkin.prototype = {
@@ -29,12 +30,7 @@ circ.checkin.prototype = {
 		obj.list.init(
 			{
 				'columns' : columns,
-				'map_row_to_column' : function(row,col) {
-					// row contains { 'my' : { 'acp' : {}, 'circ' : {}, 'mvr' : {} } }
-					// col contains one of the objects listed above in columns
-					var my = row.my;
-					return eval( col.render );
-				},
+				'map_row_to_column' : circ.util.std_map_row_to_column,
 			}
 		);
 		
diff --git a/Open-ILS/xul/staff_client/server/circ/checkout.js b/Open-ILS/xul/staff_client/server/circ/checkout.js
index d65c83f294..17e7a8d1fb 100644
--- a/Open-ILS/xul/staff_client/server/circ/checkout.js
+++ b/Open-ILS/xul/staff_client/server/circ/checkout.js
@@ -5,6 +5,7 @@ circ.checkout = function (params) {
 
 	JSAN.use('util.error'); this.error = new util.error();
 	JSAN.use('util.network'); this.network = new util.network();
+	this.OpenILS = {}; JSAN.use('OpenILS.data'); this.OpenILS.data = new OpenILS.data(); this.OpenILS.data.init({'via':'stash'});
 }
 
 circ.checkout.prototype = {
@@ -29,12 +30,7 @@ circ.checkout.prototype = {
 		obj.list.init(
 			{
 				'columns' : columns,
-				'map_row_to_column' : function(row,col) {
-					// row contains { 'my' : { 'acp' : {}, 'circ' : {}, 'mvr' : {} } }
-					// col contains one of the objects listed above in columns
-					var my = row.my;
-					return eval( col.render );
-				},
+				'map_row_to_column' : circ.util.std_map_row_to_column,
 			}
 		);
 		
diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js
index bae3f6d70d..cddfe421b2 100644
--- a/Open-ILS/xul/staff_client/server/circ/util.js
+++ b/Open-ILS/xul/staff_client/server/circ/util.js
@@ -114,4 +114,23 @@ circ.util.columns = function(modify) {
 	return c;
 }
 
+circ.util.std_map_row_to_column = function(row,col) {
+	// row contains { 'my' : { 'acp' : {}, 'circ' : {}, 'mvr' : {} } }
+	// col contains one of the objects listed above in columns
+	
+	// mimicking some of the obj in circ.checkin and circ.checkout where map_row_to_column is usually defined
+	var obj = {}; obj.OpenILS = {}; 
+	JSAN.use('OpenILS.data'); obj.OpenILS.data = new OpenILS.data(); data.init({'via':'stash'});
+
+	var my = row.my;
+	var value;
+	try { 
+		value = eval( col.render; ) 
+	} catch(E) {
+		obj.error.sdump('D_ERROR','map_row_to_column: ' + E);
+		value = '???';
+	}
+	return value;
+}
+
 dump('exiting circ/util.js\n');
-- 
2.43.2