[open-ils-commits] r14730 - in trunk/Open-ILS/src: perlmods/OpenILS/Application/Storage/CDBI perlmods/OpenILS/Application/Storage/Publisher sql/Pg/upgrade (miker)

[svn at svn.open-ils.org]

Author: miker
Date: 2009-11-02 20:57:46 -0500 (Mon, 02 Nov 2009)
New Revision: 14730

Modified:
   trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/action.pm
   trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/asset.pm
   trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm
   trunk/Open-ILS/src/sql/Pg/upgrade/0065.schema.mint_condition.sql
Log:
add support for, and use, the mint_condition flag on holds and copies; adjust the mint_condition upgrade script -- please ignore the possible failure on the post-COMMIT ALTER TABLE statement, that is generally expected

Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/action.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/action.pm	2009-11-03 00:18:45 UTC (rev 14729)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/action.pm	2009-11-03 01:57:46 UTC (rev 14730)
@@ -96,7 +96,7 @@
 				     prev_check_time expire_time requestor usr cancel_cause
 				     hold_type holdable_formats target cancel_time shelf_time
 				     phone_notify email_notify selection_depth cancel_note
-				     pickup_lib current_copy request_lib frozen thaw_date
+				     pickup_lib current_copy request_lib frozen thaw_date mint_condition
 				     fulfillment_staff fulfillment_lib selection_ou cut_in_line/);
 
 #-------------------------------------------------------------------------------

Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/asset.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/asset.pm	2009-11-03 00:18:45 UTC (rev 14729)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/asset.pm	2009-11-03 01:57:46 UTC (rev 14730)
@@ -46,7 +46,7 @@
 __PACKAGE__->columns( Essential => qw/call_number barcode creator create_date editor
 				   edit_date copy_number status loan_duration circ_lib
 				   fine_level circulate deposit price ref opac_visible
-				   circ_as_type circ_modifier deposit_amount location
+				   circ_as_type circ_modifier deposit_amount location mint_condition
 				   holdable dummy_title dummy_author deleted alert_message
 				   age_protect/ );
 

Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm	2009-11-03 00:18:45 UTC (rev 14729)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm	2009-11-03 01:57:46 UTC (rev 14730)
@@ -1019,7 +1019,8 @@
 			@$all_copies = grep {	isTrue($_->status->holdable) && 
 						isTrue($_->location->holdable) && 
 						isTrue($_->holdable) &&
-						!isTrue($_->deleted)
+						!isTrue($_->deleted) &&
+						isTrue($hold->mint_condition) ? isTrue($_->mint_condition) : 1
 					} @$all_copies;
 
 			# let 'em know we're still working

Modified: trunk/Open-ILS/src/sql/Pg/upgrade/0065.schema.mint_condition.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/upgrade/0065.schema.mint_condition.sql	2009-11-03 00:18:45 UTC (rev 14729)
+++ trunk/Open-ILS/src/sql/Pg/upgrade/0065.schema.mint_condition.sql	2009-11-03 01:57:46 UTC (rev 14730)
@@ -13,3 +13,5 @@
 
 COMMIT;
 
+ALTER TABLE auditor.action_hold_request ADD COLUMN mint_condition boolean NOT NULL DEFAULT TRUE;
+