[open-ils-commits] [GIT] Evergreen ILS branch rel_3_2 updated. de32afd744a7bdefd1418da7da503d4a9d8f508d

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_3_2 has been updated
       via  de32afd744a7bdefd1418da7da503d4a9d8f508d (commit)
      from  289e5ee465c60f94842c85ca9a8f4b308488d64f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit de32afd744a7bdefd1418da7da503d4a9d8f508d
Author: Jason Stephenson <jason at sigio.com>
Date:   Wed Mar 13 12:37:23 2019 -0400

    LP 1819796: Fix method call on undefined value in generate_fines
    
    The below message repeats in the open-ils.storage_stderr.log:
    
    Caught error from 'run' method: Can't call method "search_where" on an
    undefined value at
    /usr/local/share/perl/5.26.1/OpenILS/Application/Storage/Publisher/action.pm
    line 1014.
    
    This commit removes an errant ->search_where on a CStoreEditor call to
    make that message go away.
    
    Also, delete some lines of code that were commented out at the time the
    code was converted to use CStoreEditor.
    
    Signed-off-by: Jason Stephenson <jason at sigio.com>
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
index 872b78d795..97df335e21 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm
@@ -1002,16 +1002,9 @@ sub generate_fines {
     my $circs;
     my $editor = new_editor;
     if ($circ_id) {
-#        my $circ;
-#        if ($circ = action::circulation->search_where( { id => $circ_id, stop_fines => undef } )) {
-#            $circ = action::circulation->retrieve($circ_id)->to_fieldmapper;
-#        } elsif ($circ = booking::reservation->search_where( { id => $circ_id, return_time => undef, cancel_time => undef } )) {
-#            $circ = booking::reservation->retrieve($circ_id)->to_fieldmapper;
-#        }
-#        $circs = [$circ] if ($circ);
         $circs = $editor->search_action_circulation( { id => $circ_id, stop_fines => undef } );
         unless (@$circs) {
-            $circs = $editor->search_booking_reservation->search_where( { id => $circ_id, return_time => undef, cancel_time => undef } );
+            $circs = $editor->search_booking_reservation( { id => $circ_id, return_time => undef, cancel_time => undef } );
         }
     } else {
         $circs = [overdue_circs(undef, 1, 1, 1)];

-----------------------------------------------------------------------

Summary of changes:
 .../perlmods/lib/OpenILS/Application/Storage/Publisher/action.pm | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)


hooks/post-receive
-- 
Evergreen ILS