moved to die_events for in-transaction error handling

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_2@8819 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Cat/Merge.pm b/Open-ILS/src/perlmods/OpenILS/Application/Cat/Merge.pm
index 77e596c..310db24 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Cat/Merge.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Cat/Merge.pm
@@ -114,16 +114,15 @@ sub merge_records {
                        $vol->edit_date('now');
                        $vol->record( $master );
                        $editor->update_asset_call_number($vol)
-                               or return $editor->event;
+                               or return $editor->die_event;
                }
        }
 
        # cycle through and delete the non-master records
        for my $rec (@recs) {
 
-               my ($record, $evt) = 
-                       $editor->retrieve_biblio_record_entry($rec);
-               return $evt if $evt;
+               my $record = $editor->retrieve_biblio_record_entry($rec)
+            or return $editor->die_event;
 
                $logger->debug("merge: seeing if record $rec needs to be deleted or un-deleted");
 
@@ -135,7 +134,7 @@ sub merge_records {
                                $record->editor($reqr->id);
                                $record->edit_date('now');
                                $editor->update_biblio_record_entry($record, {checkperm => 1})
-                                       or return $editor->event;
+                                       or return $editor->die_event;
                        }
 
                } else {
@@ -144,7 +143,7 @@ sub merge_records {
                        $record->editor($reqr->id);
                        $record->edit_date('now');
                        $editor->update_biblio_record_entry($record, {checkperm => 1})
-                               or return $editor->event;
+                               or return $editor->die_event;
                }
        }
 
@@ -207,7 +206,7 @@ sub merge_volumes {
                        $copy->call_number($bigcn);
                        $copy->editor($editor->requestor->id);
                        $copy->edit_date('now');
-                       $editor->update_asset_copy($copy) or return (undef, $editor->event);
+                       $editor->update_asset_copy($copy) or return (undef, $editor->die_event);
                }
        }
 
@@ -217,8 +216,8 @@ sub merge_volumes {
                $_->deleted('t');
                $_->editor($editor->requestor->id);
                $_->edit_date('now');
-               return (undef,$editor->event) unless $editor->allowed('UPDATE_VOLUME', $_->owning_lib);
-               $editor->update_asset_call_number($_) or return (undef, $editor->event);
+               return (undef,$editor->die_event) unless $editor->allowed('UPDATE_VOLUME', $_->owning_lib);
+               $editor->update_asset_call_number($_) or return (undef, $editor->die_event);
        }
 
        my ($mvol) = grep { $_->id == $bigcn } @$volumes;