Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 9720 : uninitialized value warnings in circulation

Browse source 
This patch corrects several uninitialized value errors.

Test plan:
- Go to check out page
- Check that issues and old issues are in different tables
- Check that author is diplayed if exists
- Check that patron address is displayed if exists
- Perform a checkout

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
This commit is contained in:
Fridolyn SOMERS 2013-02-27 15:02:49 +01:00 committed by Jared Camins-Esakov
parent 0097f83863
commit 779106dfde
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
circ/circulation.pl
View file

@ -134,6 +134,7 @@ my $organisation = $query->param('organisations');
my $print = $query->param('print') || q{}; my $print = $query->param('print') || q{};
my $newexpiry = $query->param('dateexpiry'); my $newexpiry = $query->param('dateexpiry');
my $debt_confirmed = $query->param('debt_confirmed') || 0; # Don't show the debt error dialog twice my $debt_confirmed = $query->param('debt_confirmed') || 0; # Don't show the debt error dialog twice
my $charges = $query->param('charges') || q{};
# Check if stickyduedate is turned off # Check if stickyduedate is turned off
if ( $barcode ) { if ( $barcode ) {
@ -167,7 +168,7 @@ if ( $barcode eq '' && $print eq 'maybe' ) {
} }
my $inprocess = ($barcode eq '') ? '' : $query->param('inprocess'); my $inprocess = ($barcode eq '') ? '' : $query->param('inprocess');
if ( $barcode eq '' && $query->param('charges') eq 'yes' ) { if ( $barcode eq '' && $charges eq 'yes' ) {
$template->param( $template->param(
PAYCHARGES => 'yes', PAYCHARGES => 'yes',
borrowernumber => $borrowernumber borrowernumber => $borrowernumber
@ -370,7 +371,7 @@ if ($borrowernumber) {
$getreserv{suspend} = $num_res->{'suspend'}; $getreserv{suspend} = $num_res->{'suspend'};
$getreserv{suspend_until} = $num_res->{'suspend_until'}; $getreserv{suspend_until} = $num_res->{'suspend_until'};
# check if we have a waiting status for reservations # check if we have a waiting status for reservations
if ( $num_res->{'found'} eq 'W' ) { if ( $num_res->{'found'} && $num_res->{'found'} eq 'W' ) {
$getreserv{color} = 'reserved'; $getreserv{color} = 'reserved';
$getreserv{waiting} = 1; $getreserv{waiting} = 1;
# genarate information displaying only waiting reserves # genarate information displaying only waiting reserves
@ -461,18 +462,19 @@ sub build_issue_data {
$it->{'checkoutdate'} = C4::Dates->new($it->{'issuedate'},'iso')->output('syspref'); $it->{'checkoutdate'} = C4::Dates->new($it->{'issuedate'},'iso')->output('syspref');
$it->{'issuingbranchname'} = GetBranchName($it->{'branchcode'}); $it->{'issuingbranchname'} = GetBranchName($it->{'branchcode'});
$totalprice += $it->{'replacementprice'}; $totalprice += $it->{'replacementprice'} || 0;
$it->{'itemtype'} = $itemtypeinfo->{'description'}; $it->{'itemtype'} = $itemtypeinfo->{'description'};
$it->{'itemtype_image'} = $itemtypeinfo->{'imageurl'}; $it->{'itemtype_image'} = $itemtypeinfo->{'imageurl'};
$it->{'dd'} = output_pref($it->{'date_due'}); $it->{'dd'} = output_pref($it->{'date_due'});
$it->{'displaydate'} = output_pref($it->{'issuedate'}); $it->{'displaydate'} = output_pref($it->{'issuedate'});
#$it->{'od'} = ( $it->{'date_due'} lt $todaysdate ) ? 1 : 0 ; #$it->{'od'} = ( $it->{'date_due'} lt $todaysdate ) ? 1 : 0 ;
$it->{'od'} = $it->{'overdue'}; $it->{'od'} = $it->{'overdue'};
($it->{'author'} eq '') and $it->{'author'} = ' '; $it->{'author'} ||= ' ';
$it->{'renew_failed'} = $renew_failed{$it->{'itemnumber'}}; $it->{'renew_failed'} = $renew_failed{$it->{'itemnumber'}};
$it->{'return_failed'} = $return_failed{$it->{'barcode'}}; $it->{'return_failed'} = $return_failed{$it->{'barcode'}};
if ( $it->{'issuedate'}."" gt $todaysdate or $it->{'lastreneweddate'} gt $todaysdate ) { if ( ( $it->{'issuedate'} && $it->{'issuedate'} gt $todaysdate )
|| ( $it->{'lastreneweddate'} && $it->{'lastreneweddate'} gt $todaysdate ) ) {
(!$relatives) ? push @todaysissues, $it : push @relissues, $it; (!$relatives) ? push @todaysissues, $it : push @relissues, $it;
} else { } else {
(!$relatives) ? push @previousissues, $it : push @relprevissues, $it; (!$relatives) ? push @previousissues, $it : push @relprevissues, $it;
@ -647,8 +649,10 @@ my $bor_messages_loop = GetMessages( $borrowernumber, 'B', $branch );
if($bor_messages_loop){ $template->param(flagged => 1 ); } if($bor_messages_loop){ $template->param(flagged => 1 ); }
# Computes full borrower address # Computes full borrower address
my (undef, $roadttype_hashref) = &GetRoadTypes(); my @fulladdress;
my $address = $borrower->{'streetnumber'}.' '.$roadttype_hashref->{$borrower->{'streettype'}}.' '.$borrower->{'address'}; push @fulladdress, $borrower->{'streetnumber'} if ( $borrower->{'streetnumber'} );
push @fulladdress, &GetRoadTypeDetails( $borrower->{'streettype'} ) if ( $borrower->{'streettype'} );
push @fulladdress, $borrower->{'address'} if ( $borrower->{'address'} );
my $fast_cataloging = 0; my $fast_cataloging = 0;
if (defined getframeworkinfo('FA')) { if (defined getframeworkinfo('FA')) {
@ -682,7 +686,7 @@ $template->param(
expiry => format_date($borrower->{'dateexpiry'}), expiry => format_date($borrower->{'dateexpiry'}),
categorycode => $borrower->{'categorycode'}, categorycode => $borrower->{'categorycode'},
categoryname => $borrower->{description}, categoryname => $borrower->{description},
address => $address, address => join(' ', @fulladdress),
address2 => $borrower->{'address2'}, address2 => $borrower->{'address2'},
email => $borrower->{'email'}, email => $borrower->{'email'},
emailpro => $borrower->{'emailpro'}, emailpro => $borrower->{'emailpro'},