[open-ils-commits] r7711 - branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher

[svn at svn.open-ils.org]

Author: miker
Date: 2007-08-21 19:56:29 -0400 (Tue, 21 Aug 2007)
New Revision: 7711

Modified:
   branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm
Log:
backporting hold stalling support to 1.2

Modified: branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm
===================================================================
--- branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm	2007-08-21 13:24:38 UTC (rev 7710)
+++ branches/rel_1_2/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/action.pm	2007-08-21 23:56:29 UTC (rev 7711)
@@ -183,14 +183,21 @@
 	my $pl = shift;
 	my $cp = shift;
 	my $limit = int(shift()) || 10;
+	my $age = shift() || '0';
+	my $prox = shift() || 0;
 
-	my $ids = action::hold_request->db_Main->selectcol_arrayref(<<"	SQL", {}, $cp, $pl);
+	my $age_where = '';
+	if ($age) {
+		$age_where = "
+
+	my $ids = action::hold_request->db_Main->selectcol_arrayref(<<"	SQL", {}, $cp, $pl, $age, $prox);
 		SELECT	h.id
 		  FROM	action.hold_request h
 		  	JOIN action.hold_copy_map hm ON (hm.hold = h.id)
 		  	JOIN actor.org_unit_proximity p ON (p.from_org = h.pickup_lib)
 		  WHERE hm.target_copy = ?
 			AND p.to_org = ?
+		  	AND (h.request_time + ? < NOW() OR p.prox <= ?)
 			AND h.capture_time IS NULL
 		  	AND h.cancel_time IS NULL
 		ORDER BY