From: miker <miker@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Sun, 4 Feb 2007 18:10:02 +0000 (+0000)
Subject: adding Force hold support; use specific targeting time to decide closure checks
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=4ecbba783d9cb506e5c4aef8072a96585757636f;p=Evergreen.git

adding Force hold support; use specific targeting time to decide closure checks


git-svn-id: svn://svn.open-ils.org/ILS/trunk@6863 dcc99617-32d9-48b4-a31d-7c20da2025e4
---

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm
index ba673b6e0f..41ecf06abc 100644
--- a/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm
@@ -711,7 +711,7 @@ sub new_hold_copy_targeter {
 							  cancel_time => undef,
 							  prev_check_time => { '<=' => $expire_threshold },
 							},
-							{ order_by => 'selection_depth DESC, request_time,prev_check_time' } ) ];
+							{ order_by => 'CASE WHEN hold_type = \'F\' THEN 0 ELSE 1 END, selection_depth DESC, request_time,prev_check_time' } ) ];
 
 			# find all the holds holds needing first time targeting
 			push @$holds, action::hold_request->search(
@@ -719,7 +719,7 @@ sub new_hold_copy_targeter {
 							fulfillment_time => undef,
 				  			prev_check_time => undef,
 							cancel_time => undef,
-							{ order_by => 'selection_depth DESC, request_time' } );
+							{ order_by => 'CASE WHEN hold_type = \'F\' THEN 0 ELSE 1 END, selection_depth DESC, request_time' } );
 		} else {
 
 			# find all the holds holds needing first time targeting ONLY
@@ -728,7 +728,7 @@ sub new_hold_copy_targeter {
 							fulfillment_time => undef,
 				  			prev_check_time => undef,
 							cancel_time => undef,
-							{ order_by => 'selection_depth DESC, request_time' } ) ];
+							{ order_by => 'CASE WHEN hold_type = \'F\' THEN 0 ELSE 1 END, selection_depth DESC, request_time' } ) ];
 		}
 	} catch Error with {
 		my $e = shift;
@@ -736,8 +736,8 @@ sub new_hold_copy_targeter {
 	};
 
 	my @closed = actor::org_unit::closed_date->search_where(
-		{ close_start => { '<=', 'today' },
-		  close_end => { '>=', 'today' } }
+		{ close_start => { '<=', 'now' },
+		  close_end => { '>=', 'now' } }
 	);