From: Jason Etheridge <jason@esilibrary.com>
Date: Mon, 16 Mar 2015 17:56:21 +0000 (-0400)
Subject: make migration_tools.apply_circ_matrix_to_specific_circ use the more recent apply_cir... 
X-Git-Url: http://git.equinoxoli.org/?p=migration-tools.git;a=commitdiff_plain;h=023943cdc7069a5aa405e1257e875e9e49acfbcb

make migration_tools.apply_circ_matrix_to_specific_circ use the more recent apply_circ_matrix code

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
---

diff --git a/sql/base/base.sql b/sql/base/base.sql
index b786140..6a46f22 100644
--- a/sql/base/base.sql
+++ b/sql/base/base.sql
@@ -1253,10 +1253,10 @@ BEGIN
       INTO this_duration_rule,
            this_fine_rule,
            this_max_fine_rule
-      duration_rule,
-      recurring_fine_rule,
-      max_fine_rule
-      FROM action.item_user_circ_test(
+      (matchpoint).duration_rule,
+      (matchpoint).recurring_fine_rule,
+      (matchpoint).max_fine_rule
+      FROM action.find_circ_matrix_matchpoint(
         circ_lib,
         target_copy,
         usr,
@@ -1282,7 +1282,8 @@ BEGIN
           WHEN TRUE THEN (rmf.amount / 100.0) * ac.price
           ELSE rmf.amount
         END,
-      renewal_remaining = rcd.max_renewals
+      renewal_remaining = rcd.max_renewals,
+      grace_period = rrf.grace_period
     FROM
       config.rule_circ_duration rcd,
       config.rule_recurring_fine rrf,