[open-ils-commits] r16590 - in trunk/Open-ILS/src/perlmods/OpenILS/Application: . Circ (erickson)

[svn at svn.open-ils.org]

Author: erickson
Date: 2010-06-04 09:28:37 -0400 (Fri, 04 Jun 2010)
New Revision: 16590

Modified:
   trunk/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm
   trunk/Open-ILS/src/perlmods/OpenILS/Application/AppUtils.pm
   trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ/Money.pm
Log:
added granularity and user_data options to create_events_for_hook wrapper

Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm	2010-06-04 03:54:14 UTC (rev 16589)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Actor.pm	2010-06-04 13:28:37 UTC (rev 16590)
@@ -4168,13 +4168,13 @@
             if($is_hold) {
 
                 my $hold = $e->retrieve_action_hold_request($id);
-                $U->create_events_for_hook('ahr.format.history.email', $hold, $hold->request_lib, 1);
+                $U->create_events_for_hook('ahr.format.history.email', $hold, $hold->request_lib, undef, undef, 1);
                 # events will be fired from action_trigger_runner
 
             } else {
 
                 my $circ = $e->retrieve_action_circulation($id);
-                $U->create_events_for_hook('circ.format.history.email', $circ, $circ->circ_lib, 1);
+                $U->create_events_for_hook('circ.format.history.email', $circ, $circ->circ_lib, undef, undef, 1);
                 # events will be fired from action_trigger_runner
             }
         }

Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/AppUtils.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/AppUtils.pm	2010-06-04 03:54:14 UTC (rev 16589)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/AppUtils.pm	2010-06-04 13:28:37 UTC (rev 16590)
@@ -1667,9 +1667,10 @@
 
 
 sub create_events_for_hook {
-    my($self, $hook, $obj, $org_id, $wait) = @_;
+    my($self, $hook, $obj, $org_id, $granularity, $user_data, $wait) = @_;
     my $ses = OpenSRF::AppSession->create('open-ils.trigger');
-    my $req = $ses->request('open-ils.trigger.event.autocreate', $hook, $obj, $org_id);
+    my $req = $ses->request('open-ils.trigger.event.autocreate', 
+        $hook, $obj, $org_id, $granularity, $user_data);
     return undef unless $wait;
     my $resp = $req->recv;
     return $resp->content if $resp;

Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ/Money.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ/Money.pm	2010-06-04 03:54:14 UTC (rev 16589)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Circ/Money.pm	2010-06-04 13:28:37 UTC (rev 16590)
@@ -492,7 +492,7 @@
     } elsif ($for_email) {
 
         for my $p (@$payments) {
-            $U->create_events_for_hook('money.format.payment_receipt.email', $p, $p->xact->usr->home_ou, 1);
+            $U->create_events_for_hook('money.format.payment_receipt.email', $p, $p->xact->usr->home_ou, undef, undef, 1);
         }
     }