Attachment 47110 Details for Bug 14598 – Bug 14598: (QA followup) Don't die on bad barcode

[patch] Bug 14598: (QA followup) Don't die on bad barcode

Bug-14598-QA-followup-Dont-die-on-bad-barcode.patch (text/plain), 1.60 KB, created by Tomás Cohen Arazi (tcohen) on 2016-01-21 13:40:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomás Cohen Arazi (tcohen)

Created: 2016-01-21 13:40:29 UTC

Size: 1.60 KB

patch

obsolete

>From 6c1c2fbd7a171a18acadd41d72f4bf6a7dad2d8b Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Mon, 27 Jul 2015 11:16:56 -0400
>Subject: [PATCH] Bug 14598: (QA followup) Don't die on bad barcode
>
>Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
>---
> C4/Circulation.pm | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/C4/Circulation.pm b/C4/Circulation.pm
>index 10baa7b..fddcf79 100644
>--- a/C4/Circulation.pm
>+++ b/C4/Circulation.pm
>@@ -1808,17 +1808,17 @@ sub AddReturn {
>     my $stat_type = 'return';
> 
>     # get information on item
>-    my $item       = GetItem( undef, $barcode )
>-        or die "GetItem( undef, $barcode ) failed";
>+    my $item = GetItem( undef, $barcode );
>+    unless ($item) {
>+        return ( 0, { BadBarcode => $barcode } );    # no barcode means no item or borrower.  bail out.
>+    }
>+
>     my $itemnumber = $item->{ itemnumber };
>     my $biblio = GetBiblioData( $item->{ biblionumber } );
>     my $itemtype   = ( C4::Context->preference("item-level_itypes") )
>                         ? $item->{ itype }
>                         : $biblio->{ itemtype };
> 
>-    unless ($itemnumber) {
>-        return (0, { BadBarcode => $barcode }); # no barcode means no item or borrower.  bail out.
>-    }
>     my $issue  = GetItemIssue($itemnumber);
>     if ($issue and $issue->{borrowernumber}) {
>         $borrower = C4::Members::GetMemberDetails($issue->{borrowernumber})
>-- 
>2.7.0

Actions: View | Diff | Splinter Review

Attachments on bug 14598: 41198 | 41199 | 41200 | 41201 | 41202 | 41203 | 41204 | 41205 | 41383 | 41384 | 41385 | 41627 | 41628 | 41629 | 41637 | 42171 | 42177 | 44665 | 44666 | 44667 | 44668 | 45030 | 45047 | 45838 | 45843 | 45844 | 46546 | 46877 | 47108 | 47109 | 47110 | 47111 | 47112 | 47113 | 47114 | 47115 | 47116 | 49797 | 49798 | 49799 | 49800 | 49801 | 49802 | 49803 | 49804 | 49805 | 49807 | 49963 | 49964 | 49965 | 49966 | 49967 | 49968 | 49969 | 49970 | 49971 | 49972 | 49978 | 49979 | 49980 | 49981 | 49982 | 49983 | 49984 | 49985 | 49986 | 49987 | 49988 | 50018 | 56941 | 56942 | 56943 | 56944 | 56945 | 56946 | 56947 | 56948 | 56949 | 56950 | 56951 | 56952 | 56953 | 62539 | 62555 | 62682