Bug 23463: Fix safe_return return value in deletion tools

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

diff --git a/tools/batchMod.pl b/tools/batchMod.pl
index eedf9b8..8b13257 100755 (executable)
--- a/tools/batchMod.pl
+++ b/tools/batchMod.pl
@@ -191,7 +191,7 @@ if ($op eq "action") {
         my $itemdata = $item->unblessed;
         if ( $del ){
             my $return = $item->safe_delete;
-                       if ($return == 1) {
+            if (ref($return)) {
                            $deleted_items++;
                        } else {
                            $not_deleted_items++;

diff --git a/tools/batch_delete_records.pl b/tools/batch_delete_records.pl
index d1ab80c..1dccbae 100755 (executable)
--- a/tools/batch_delete_records.pl
+++ b/tools/batch_delete_records.pl
@@ -177,8 +177,8 @@ if ( $op eq 'form' ) {
             # Delete items
             my $items = Koha::Items->search({ biblionumber => $biblionumber });
             while ( my $item = $items->next ) {
-                my $error = eval { $item->safe_delete };
-                if ( $error ne '1' or $@ ) {
+                my $deleted_item = eval { $item->safe_delete };
+                if ( !ref($deleted_item) or $@ ) {
                     push @messages, {
                         type => 'error',
                         code => 'item_not_deleted',