[Koha-patches] [PATCH] Squashed commit of the following:

Chris Cormack chrisc at catalyst.net.nz
Mon Jul 26 00:13:35 CEST 2010


commit d6a7c8f1fdebe4e9693651efbafa53ae582c4830
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Jul 26 10:06:37 2010 +1200

    Silencing more warns

commit cc0c8262973536c870593bcf9f33dcd8e871f9b5
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Jul 26 10:04:10 2010 +1200

    Silencing noisy warns in reserve/request.pl
---
 reserve/request.pl |   21 +++++++++------------
 1 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/reserve/request.pl b/reserve/request.pl
index 859a65b..a24d276 100755
--- a/reserve/request.pl
+++ b/reserve/request.pl
@@ -91,22 +91,20 @@ my $warnings;
 my $messages;
 
 my $date = C4::Dates->today('iso');
-my $action = $input->param('action');
+my $action = $input->param('action') || '';
 
 if ( $action eq 'move' ) {
   my $where = $input->param('where');
-  my $borrowernumber = $input->param('borrowernumber');
-  my $biblionumber = $input->param('biblionumber');
-                     
+  my $borrowernumber = $input->param('borrowernumber') || '';
+  my $biblionumber = $input->param('biblionumber') || '';                     
   AlterPriority( $where, $borrowernumber, $biblionumber );
-
 } elsif ( $action eq 'cancel' ) {
-  my $borrowernumber = $input->param('borrowernumber');
-  my $biblionumber = $input->param('biblionumber');
+  my $borrowernumber = $input->param('borrowernumber') || '';
+  my $biblionumber = $input->param('biblionumber') || '';
   CancelReserve( $biblionumber, '', $borrowernumber );
 } elsif ( $action eq 'setLowestPriority' ) {
-  my $borrowernumber = $input->param('borrowernumber');
-  my $biblionumber   = $input->param('biblionumber');
+  my $borrowernumber = $input->param('borrowernumber') || '';
+  my $biblionumber   = $input->param('biblionumber') || '';
   ToggleLowestPriority( $borrowernumber, $biblionumber );
 }
 
@@ -320,12 +318,11 @@ foreach my $biblionumber (@biblionumbers) {
         my $num_available = 0;
         my $num_override  = 0;
         
-        $biblioitem->{description} =
-          $itemtypes->{ $biblioitem->{itemtype} }{description};
+        $biblioitem->{description} = $itemtypes->{ $biblioitem->{itemtype} }{description} if $biblioitem->{itemtype};
         $biblioloopiter{description} = $biblioitem->{description};
         $biblioloopiter{itypename} = $biblioitem->{description};
         $biblioloopiter{imageurl} =
-          getitemtypeimagelocation('intranet', $itemtypes->{$biblioitem->{itemtype}}{imageurl});
+          getitemtypeimagelocation('intranet', $itemtypes->{$biblioitem->{itemtype}}{imageurl} ) if $biblioitem->{itemtype};
         
         foreach my $itemnumber ( @{ $itemnumbers_of_biblioitem{$biblioitemnumber} } )    {
             my $item = $iteminfos_of->{$itemnumber};
-- 
1.7.0.4



More information about the Koha-patches mailing list