From f84671dce925ef0f5127073520d35b480613e3c1 Mon Sep 17 00:00:00 2001 From: Ian Walls Date: Fri, 6 Jan 2012 09:53:49 -0500 Subject: [PATCH 1/2] Bug 7016 Followup: Add new GetItemnumberForBiblio subroutine Adds a new subroutine in C4::Items, GetItemnumbersForBiblio, which takes a single biblionumber, and returns an array of all the corresponding itemnumbers. This patch also replaces the usage of get_itemnumbers_of in C4::Reserves::CanBookBeReserved with this new subroutine, as the output is more consistent with what we were lookng for (this is what fixes the bug issue). Signed-off-by: Galen Charlton --- C4/Items.pm | 21 +++++++++++++++++++++ C4/Reserves.pm | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/C4/Items.pm b/C4/Items.pm index 4915884afd..59eaa69636 100644 --- a/C4/Items.pm +++ b/C4/Items.pm @@ -70,6 +70,7 @@ BEGIN { GetItemsInfo GetItemsLocationInfo GetHostItemsInfo + GetItemnumbersForBiblio get_itemnumbers_of get_hostitemnumbers_of GetItemnumberFromBarcode @@ -1497,6 +1498,26 @@ sub GetLastAcquisitions { return @results; } +=head2 GetItemnumberForBiblio + + my @itemnumbers = GetItemnumbersForBiblio($biblionumber); + +Given a single biblionumber, return an array of all the corresponding itemnumbers + +=cut + +sub GetItemnumbersForBiblio { + my $biblionumber = shift; + my @items; + my $dbh = C4::Context->dbh; + my $sth = $dbh->prepare("SELECT itemnumber FROM items WHERE biblionumber = ?"); + $sth->execute($biblionumber); + while (my $result = $sth->fetchrow_hashref) { + push @items, $result->{'itemnumber'}; + } + return \@items; +} + =head2 get_itemnumbers_of my @itemnumbers_of = get_itemnumbers_of(@biblionumbers); diff --git a/C4/Reserves.pm b/C4/Reserves.pm index f12c23f009..2b915670c5 100644 --- a/C4/Reserves.pm +++ b/C4/Reserves.pm @@ -383,7 +383,7 @@ sub GetReservesFromBorrowernumber { sub CanBookBeReserved{ my ($borrowernumber, $biblionumber) = @_; - my @items = get_itemnumbers_of($biblionumber); + my @items = GetItemnumbersForBiblio($biblionumber); #get items linked via host records my @hostitems = get_hostitemnumbers_of($biblionumber); if (@hostitems){ From dc1d934c8f966dfbb824613f9ef034519acd2f05 Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Wed, 11 Apr 2012 16:13:22 -0400 Subject: [PATCH 2/2] bug 7016 further followup: clarify return of GetItemnumbersForBiblio New function was actually returning an arrayref, so made perldoc and function usage consistent. Signed-off-by: Galen Charlton Signed-off-by: Paul Poulain --- C4/Items.pm | 6 +++--- C4/Reserves.pm | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/C4/Items.pm b/C4/Items.pm index 59eaa69636..64ed0972a6 100644 --- a/C4/Items.pm +++ b/C4/Items.pm @@ -1498,11 +1498,11 @@ sub GetLastAcquisitions { return @results; } -=head2 GetItemnumberForBiblio +=head2 GetItemnumbersForBiblio - my @itemnumbers = GetItemnumbersForBiblio($biblionumber); + my $itemnumbers = GetItemnumbersForBiblio($biblionumber); -Given a single biblionumber, return an array of all the corresponding itemnumbers +Given a single biblionumber, return an arrayref of all the corresponding itemnumbers =cut diff --git a/C4/Reserves.pm b/C4/Reserves.pm index 2b915670c5..d1cb88eb31 100644 --- a/C4/Reserves.pm +++ b/C4/Reserves.pm @@ -383,14 +383,14 @@ sub GetReservesFromBorrowernumber { sub CanBookBeReserved{ my ($borrowernumber, $biblionumber) = @_; - my @items = GetItemnumbersForBiblio($biblionumber); + my $items = GetItemnumbersForBiblio($biblionumber); #get items linked via host records my @hostitems = get_hostitemnumbers_of($biblionumber); if (@hostitems){ - push (@items,@hostitems); + push (@$items,@hostitems); } - foreach my $item (@items){ + foreach my $item (@$items){ return 1 if CanItemBeReserved($borrowernumber, $item); } return 0;