From: Bill Erickson <berickxx@gmail.com>
Date: Thu, 11 Dec 2014 19:36:11 +0000 (-0500)
Subject: LP#1386347 clear maps at fulfillment time
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=c6ff6f08d84bc4dcf00b2d78b0e8ebc9ba496240;p=evergreen%2Fmasslnc.git

LP#1386347 clear maps at fulfillment time

For backwards compatibility with queue stats info on captured holds,
clear hold copy maps at fulfillment time instead of capture time, as
before.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
---

diff --git a/Open-ILS/src/sql/Pg/090.schema.action.sql b/Open-ILS/src/sql/Pg/090.schema.action.sql
index d56c34064d..0a1c5bf895 100644
--- a/Open-ILS/src/sql/Pg/090.schema.action.sql
+++ b/Open-ILS/src/sql/Pg/090.schema.action.sql
@@ -416,7 +416,7 @@ CREATE TRIGGER hold_request_clear_map_tgr
     FOR EACH ROW
     WHEN (
         (NEW.cancel_time IS NOT NULL AND OLD.cancel_time IS NULL)
-        OR (NEW.capture_time IS NOT NULL AND OLD.capture_time IS NULL)
+        OR (NEW.fulfillment_time IS NOT NULL AND OLD.fulfillment_time IS NULL)
     )
     EXECUTE PROCEDURE action.hold_request_clear_map();
 
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.clear_hold_copy_map.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.clear_hold_copy_map.sql
index ee0191df66..3604444e17 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.clear_hold_copy_map.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.clear_hold_copy_map.sql
@@ -12,7 +12,7 @@ CREATE TRIGGER hold_request_clear_map_tgr
     FOR EACH ROW
     WHEN (
         (NEW.cancel_time IS NOT NULL AND OLD.cancel_time IS NULL)
-        OR (NEW.capture_time IS NOT NULL AND OLD.capture_time IS NULL)
+        OR (NEW.fulfillment_time IS NOT NULL AND OLD.fulfillment_time IS NULL)
     )
     EXECUTE PROCEDURE action.hold_request_clear_map();