From 56621ce965e053718ed67edccc2b2c45d41c7d53 Mon Sep 17 00:00:00 2001
From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Fri, 6 Nov 2009 17:08:54 +0000
Subject: [PATCH] don't pre-validate events when grouping, just fetch and group
git-svn-id: svn://svn.open-ils.org/ILS/trunk@14807 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
.../src/perlmods/OpenILS/Application/Trigger.pm | 45 +++++++++++-----------
1 file changed, 23 insertions(+), 22 deletions(-)
diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Trigger.pm b/Open-ILS/src/perlmods/OpenILS/Application/Trigger.pm
index 0fa0fb023b..22863b3635 100644
--- a/Open-ILS/src/perlmods/OpenILS/Application/Trigger.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Trigger.pm
@@ -553,6 +553,10 @@ sub grouped_events {
my %groups = ( '*' => [] );
for my $e_id ( @$events ) {
+ $logger->info("trigger: processing event $e_id");
+
+ # let the client know we're still chugging along TODO add osrf support for method_lookup $client's
+ $client->status( new OpenSRF::DomainObject::oilsContinueStatus );
my $e;
try {
@@ -562,37 +566,34 @@ sub grouped_events {
};
next unless $e;
- my $valid;
try {
- $valid = $e->validate->valid;
+ $e->build_environment;
} catch Error with {
- $logger->error("Event validation failed with ".shift());
+ $logger->error("Event environment building failed with ".shift());
};
- if ($valid) {
-
- if (my $group = $e->event->event_def->group_field) {
+ if (my $group = $e->event->event_def->group_field) {
- # split the grouping link steps
- my @steps = split /\./, $group;
+ # split the grouping link steps
+ my @steps = split /\./, $group;
- # find the grouping object
- my $node = $e->target;
- $node = $node->$_() for ( @steps );
+ # find the grouping object
+ my $node = $e->target;
+ $node = $node->$_() for ( @steps );
- # get the pkey value for the grouping object on this event
- my $node_ident = $node->Identity;
- my $ident_value = $node->$node_ident();
+ # get the pkey value for the grouping object on this event
+ my $node_ident = $node->Identity;
+ my $ident_value = $node->$node_ident();
- # push this event onto the event+grouping_pkey_value stack
- $groups{$e->event->event_def->id}{$ident_value} ||= [];
- push @{ $groups{$e->event->event_def->id}{$ident_value} }, $e;
- } else {
- # it's a non-grouped event
- push @{ $groups{'*'} }, $e;
- }
+ # push this event onto the event+grouping_pkey_value stack
+ $groups{$e->event->event_def->id}{$ident_value} ||= [];
+ push @{ $groups{$e->event->event_def->id}{$ident_value} }, $e;
+ } else {
+ # it's a non-grouped event
+ push @{ $groups{'*'} }, $e;
}
+
$e->editor->disconnect;
}
@@ -611,7 +612,7 @@ sub run_all_events {
my ($groups) = $self->method_lookup('open-ils.trigger.event.find_pending_by_group')->run($granularity);
- for my $def ( %$groups ) {
+ for my $def ( keys %$groups ) {
if ($def eq '*') {
for my $event ( @{ $$groups{'*'} } ) {
try {
--
2.11.0