[Koha-cvs] koha/reserve request.pl [rel_3_0]

[Antoine Farnault]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     Antoine Farnault <toins>        06/11/20 11:02:42

Modified files:
        reserve        : request.pl 

Log message:
         - removing Date::Manip.
         - re-indenting.
         - removing warn compilation.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/reserve/request.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.6.2.7&r2=1.6.2.8

Patches:
Index: request.pl
===================================================================
RCS file: /sources/koha/koha/reserve/request.pl,v
retrieving revision 1.6.2.7
retrieving revision 1.6.2.8
diff -u -b -r1.6.2.7 -r1.6.2.8
--- request.pl  17 Nov 2006 14:57:22 -0000      1.6.2.7
+++ request.pl  20 Nov 2006 11:02:42 -0000      1.6.2.8
@@ -1,8 +1,7 @@
 #!/usr/bin/perl
 
-# $Id: request.pl,v 1.6.2.7 2006/11/17 14:57:22 tipaul Exp $
+# $Id: request.pl,v 1.6.2.8 2006/11/20 11:02:42 toins Exp $
 
-#script to place reserves/requests
 #writen 2/1/00 by address@hidden
 # Copyright 2000-2002 Katipo Communications
 #
@@ -21,15 +20,17 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
+=head1 request.pl
+
+script to place reserves/requests
+
+=cut
+
 use strict;
 use HTML::Template;
 use CGI;
-use Date::Manip;
 use List::MoreUtils qw/uniq/;
-use Data::Dumper;
-use Date::Calc qw/Today/;
-
-use C4::Search;
+use Date::Calc qw/Today Date_to_Days/;
 use C4::Output;
 use C4::Interface::CGI::Output;
 use C4::Auth;
@@ -37,22 +38,22 @@
 use C4::Biblio;
 use C4::Koha;
 use C4::Circulation::Circ2;
-# FIXME Is there utility to use Acquisition.pm ???? 
-# use C4::Acquisition;
 use C4::Date;
 use C4::Members;
+use C4::Search; # bibdata
 
 my $dbh = C4::Context->dbh;
 my $sth;
 my $input = new CGI;
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+    {
         template_name => "reserve/request.tmpl",
         query => $input,
         type => "intranet",
         authnotrequired => 0,
-        flagsrequired => {reserveforothers => 1},
-    });
+        flagsrequired   => { reserveforothers => 1 },
+    }
+);
 
 # get biblio information....
 my $biblionumber = $input->param('biblionumber');
@@ -66,20 +67,20 @@
 my $borrowerslist;
 my $messageborrower;
 
-# my $date = today();
-my $date= sprintf('%04d-%02d-%02d', Today());
+my $date = sprintf( '%04d-%02d-%02d', Today() );
 
 if ($findborrower) {
-    my ($count,$borrowers) =  BornameSearch(\%env, $findborrower, 
'cardnumber', 'web');
+    my ( $count, $borrowers ) =
+      BornameSearch( \%env, $findborrower, 'cardnumber', 'web' );
 
     my @borrowers = @$borrowers;
 
-    if ($#borrowers == -1) {
-        $input->param('findborrower', '');
+    if ( $#borrowers == -1 ) {
+        $input->param( 'findborrower', '' );
         $messageborrower =  "'$findborrower'";
     }
-    elsif ($#borrowers == 0) {
-        $input->param('cardnumber', $borrowers[0]->{'cardnumber'});
+    elsif ( $#borrowers == 0 ) {
+        $input->param( 'cardnumber', $borrowers[0]->{'cardnumber'} );
         $cardnumber = $borrowers[0]->{'cardnumber'};
     }
     else {
@@ -88,7 +89,7 @@
 }
 
 if ($cardnumber) {
-       my $borrowerinfo = getpatroninformation (\%env,0,$cardnumber);
+    my $borrowerinfo = getpatroninformation( \%env, 0, $cardnumber );
        my $expiry;
        my $diffbranch;
        my @getreservloop;
@@ -99,20 +100,21 @@
 # FIXME At this time we have a simple count of reservs, but, later, we could 
improve the infos "title" ...
 
         my $number_reserves =
-            CountReservesFromBorrower($borrowerinfo->{'borrowernumber'});
+      CountReservesFromBorrower( $borrowerinfo->{'borrowernumber'} );
 
-        if ($number_reserves > C4::Context->preference('maxreserves')) {
+    if ( $number_reserves > C4::Context->preference('maxreserves') ) {
             $maxreserves = 1;
         }
 
-# we check the date expiricy of the borrower
-       my 
$warning=Date_Cmp(ParseDate("today"),format_date($borrowerinfo->{'dateexpiry'}));
-       if ( $warning > 0) {
+    # we check the date expiricy of the borrower
+    my $warning = (Date_to_Days(split /-/,$date) > Date_to_Days( split 
/-/,$borrowerinfo->{'dateexpiry'}));
+     
+    if ( $warning > 0 ) {
                        $expiry = 1;
        }
 
-# check if the borrower make the reserv in a different branch
-       if ($borrowerinfo->{'branchcode'} ne C4::Context->userenv->{'branch'}) {
+    # check if the borrower make the reserv in a different branch
+    if ( $borrowerinfo->{'branchcode'} ne C4::Context->userenv->{'branch'} ) {
                $diffbranch = 1;
        }
 
@@ -126,9 +128,7 @@
        );
 }
 
-$template->param(
-    messageborrower => $messageborrower
-);
+$template->param( messageborrower => $messageborrower );
 
 my $CGIselectborrower;
 if ($borrowerslist) {
@@ -136,17 +136,19 @@
     my %labels;
 
     foreach my $borrower (
-        sort {$a->{surname}.$a->{firstname} cmp $b->{surname}.$b->{firstname}}
-            @{$borrowerslist}
-    ) {
+        sort {
+                $a->{surname}
+              . $a->{firstname} cmp $b->{surname}
+              . $b->{firstname}
+        } @{$borrowerslist}
+      )
+    {
         push @values, $borrower->{cardnumber};
 
         $labels{ $borrower->{cardnumber} } = sprintf(
             '%s, %s ... (%s - %s) ... %s',
-            $borrower->{surname},
-            $borrower->{firstname},
-            $borrower->{cardnumber},
-            $borrower->{categorycode},
+            $borrower->{surname},    $borrower->{firstname},
+            $borrower->{cardnumber}, $borrower->{categorycode},
             $borrower->{streetaddress},
         );
     }
@@ -161,53 +163,48 @@
 }
 
 # get existing reserves .....
-my ($count, $reserves) = FindReserves($biblionumber, undef);
+my ( $count, $reserves ) = FindReserves( $biblionumber, undef );
 my $totalcount = $count;
 my $alreadyreserved;
 
 # FIXME launch another time getpatroninformation perhaps until
-my $borrowerinfo = getpatroninformation (\%env,0,$cardnumber);
+my $borrowerinfo = getpatroninformation( \%env, 0, $cardnumber );
 
 foreach my $res (@$reserves) {
-    if (($res->{found} eq 'W') or ($res->{priority} == 0)) {
+    if ( ( $res->{found} eq 'W' ) or ( $res->{priority} == 0 ) ) {
        $count--;
     }
 
-    if ($borrowerinfo->{borrowernumber} eq $res->{borrowernumber}) {
+    if ( $borrowerinfo->{borrowernumber} eq $res->{borrowernumber} ) {
        $alreadyreserved = 1;
     }
 }
-$template->param(alreadyreserved => $alreadyreserved);
+$template->param( alreadyreserved => $alreadyreserved );
 
 # make priorities options
 my @optionloop;
-for (1 .. $count + 1) {
+for ( 1 .. $count + 1 ) {
     push(
         @optionloop,
         {
             num => $_,
-            selected => ($_ == $count + 1),
+            selected => ( $_ == $count + 1 ),
         }
     );
 }
 
 my @branchcodes;
 my %itemnumbers_of_biblioitem;
-my @itemnumbers = @{get_itemnumbers_of($biblionumber)->{$biblionumber}};
+my @itemnumbers  = @{ get_itemnumbers_of($biblionumber)->{$biblionumber} };
 my $iteminfos_of = GetItemInfosOf(@itemnumbers);
 
 foreach my $itemnumber (@itemnumbers) {
-    push(
-        @branchcodes,
+    push( @branchcodes,
         $iteminfos_of->{$itemnumber}->{homebranch},
-        $iteminfos_of->{$itemnumber}->{holdingbranch}
-    );
+        $iteminfos_of->{$itemnumber}->{holdingbranch} );
 
     my $biblioitemnumber = $iteminfos_of->{$itemnumber}->{biblioitemnumber};
-    push(
-        @{ $itemnumbers_of_biblioitem{$biblioitemnumber} },
-        $itemnumber
-    );
+    push( @{ $itemnumbers_of_biblioitem{$biblioitemnumber} }, $itemnumber );
 }
 
 @branchcodes = uniq @branchcodes;
@@ -235,7 +232,9 @@
     $biblioitem->{description} =
         $itemtypeinfos_of->{ $biblioitem->{itemtype} }{description};
 
-    foreach my $itemnumber (@{$itemnumbers_of_biblioitem{$biblioitemnumber}}) {
+    foreach
+      my $itemnumber ( @{ $itemnumbers_of_biblioitem{$biblioitemnumber} } )
+    {
         my $item = $iteminfos_of->{$itemnumber};
 
         $item->{homebranchname} =
@@ -243,7 +242,7 @@
 
         # if the holdingbranch is different than the homebranch, we show the
         # holdingbranch of the document too
-        if ($item->{homebranch} ne $item->{holdingbranch}) {
+        if ( $item->{homebranch} ne $item->{holdingbranch} ) {
             $item->{holdingbranchname} =
                 $branchinfos_of->{ $item->{holdingbranch} }{branchname};
         }
@@ -252,8 +251,8 @@
         # change the background color
         my $date_due;
 
-        if (defined $return_date_of->{$itemnumber}) {
-            $date_due = format_date($return_date_of->{$itemnumber});
+        if ( defined $return_date_of->{$itemnumber} ) {
+            $date_due = format_date( $return_date_of->{$itemnumber} );
            $item->{date_due} = $date_due;
             $item->{backgroundcolor} = 'onloan';
         }
@@ -261,126 +260,128 @@
         # checking reserve
         my $reservedate = GetFirstReserveDateFromItem($itemnumber);
 
-        if (defined $reservedate) {
+        if ( defined $reservedate ) {
             $item->{backgroundcolor} = 'reserved';
             $item->{reservedate} = format_date($reservedate);
         }
 
         # Management of the notforloan document
-        if ($item->{notforloan}) {
+        if ( $item->{notforloan} ) {
             $item->{backgroundcolor} = 'other';
             $item->{notforloanvalue} =
                 $notforloan_label_of->{ $item->{notforloan} };
         }
 
         # Management of lost or long overdue items
-        if ($item->{itemlost}) {
+        if ( $item->{itemlost} ) {
 
             # FIXME localized strings should never be in Perl code
-            $item->{message} = $item->{itemlost} == 1
-                ? "(lost)"
-                : $item->{itemlost} == 2
-                    ? "(long overdue)"
+            $item->{message} =
+                $item->{itemlost} == 1 ? "(lost)"
+              : $item->{itemlost} == 2 ? "(long overdue)"
                     : "";
             $item->{backgroundcolor} = 'other';
         }
 
         # Check of the transfered documents 
-        my ($transfertwhen,$transfertfrom,$transfertto) =
+        my ( $transfertwhen, $transfertfrom, $transfertto ) =
             get_transfert_infos($itemnumber);
 
-        if ($transfertwhen ne '') {
+        if ( $transfertwhen ne '' ) {
             $item->{transfertwhen} = format_date($transfertwhen);
             $item->{transfertfrom} =
                 $branchinfos_of->{$transfertfrom}{branchname};
-            $item->{transfertto} =
-                $branchinfos_of->{$transfertto}{branchname};
+            $item->{transfertto} = $branchinfos_of->{$transfertto}{branchname};
         }
 
         # If there is no loan, return and transfer, we show a checkbox.
         $item->{notforloan} = $item->{notforloan} || 0;
 
         # An item is available only if:
-        if (not defined $reservedate      # not reserved yet
+        if (
+            not defined $reservedate    # not reserved yet
             and $date_due eq ''           # not currently on loan
             and not $item->{itemlost}     # not lost
             and not $item->{notforloan}   # not forbidden to loan
             and $transfertwhen eq ''      # not currently on transfert
-        ) {
+          )
+        {
             $item->{available} = 1;
         }
 
-        push @{$biblioitem->{itemloop}}, $item;
+        push @{ $biblioitem->{itemloop} }, $item;
     }
 
     push @bibitemloop, $biblioitem;
 }
 
-
 # existingreserves building
 my @reserveloop;
 my $branches = GetBranches('RE');
-foreach my $res (sort {$a->{found} cmp $b->{found}} @$reserves){
+foreach my $res ( sort { $a->{found} cmp $b->{found} } @$reserves ) {
     my %reserve;
     my @optionloop;
-    for (my $i=1; $i <= $totalcount; $i++) {
+    for ( my $i = 1 ; $i <= $totalcount ; $i++ ) {
         push(
             @optionloop,
             {
                 num => $i,
-                selected => ($i == $res->{priority}),
+                selected => ( $i == $res->{priority} ),
             }
         );
     }
     my @branchloop;
-    foreach my $br (keys %$branches) {
+    foreach my $br ( keys %$branches ) {
         my %abranch;
-        $abranch{'selected'}=($br eq $res->{'branchcode'});
-        $abranch{'branch'}=$br;
-        $abranch{'branchname'}=$branches->{$br}->{'branchname'};
-        push(@branchloop,\%abranch);
+        $abranch{'selected'}   = ( $br eq $res->{'branchcode'} );
+        $abranch{'branch'}     = $br;
+        $abranch{'branchname'} = $branches->{$br}->{'branchname'};
+        push( @branchloop, \%abranch );
     }
 
-    if (($res->{'found'} eq 'W') or ($res->{'priority'} eq '0')) {
+    if ( ( $res->{'found'} eq 'W' ) or ( $res->{'priority'} eq '0' ) ) {
         my %env;
         my $item = $res->{'itemnumber'};
         $item = getiteminformation($item);
-        $reserve{'holdingbranch'}=$item->{'holdingbranch'};
-        $reserve{'barcode'}=$item->{'barcode'};
-        $reserve{'biblionumber'}=$item->{'biblionumber'};
+        $reserve{'holdingbranch'} = $item->{'holdingbranch'};
+        $reserve{'barcode'}       = $item->{'barcode'};
+        $reserve{'biblionumber'}  = $item->{'biblionumber'};
         $reserve{'wbrcode'} = $res->{'branchcode'};
-        $reserve{'wbrname'} = 
$branches->{$res->{'branchcode'}}->{'branchname'};
-        if($reserve{'holdingbranch'} eq $reserve{'wbrcode'}){
+        $reserve{'wbrname'}       =
+          $branches->{ $res->{'branchcode'} }->{'branchname'};
+
+        if ( $reserve{'holdingbranch'} eq $reserve{'wbrcode'} ) {
             $reserve{'atdestination'} = 1;
         }
     }
 
-    $reserve{'date'} = format_date($res->{'reservedate'});
-    $reserve{'borrowernumber'}=$res->{'borrowernumber'};
-    $reserve{'biblionumber'}=$res->{'biblionumber'};
-    $reserve{'borrowernumber'}=$res->{'borrowernumber'};
-    $reserve{'firstname'}=$res->{'firstname'};
-    $reserve{'surname'}=$res->{'surname'};
-    $reserve{'borrowernumber'}=$res->{'borrowernumber'};
-    $reserve{'notes'}=$res->{'reservenotes'};
-    $reserve{'wait'}=(($res->{'found'} eq 'W') or ($res->{'priority'} eq '0'));
-    $reserve{'constrainttypea'}=($res->{'constrainttype'} eq 'a');
-    $reserve{'constrainttypeo'}=($res->{'constrainttype'} eq 'o');
-    $reserve{'voldesc'}=$res->{'volumeddesc'};
-    $reserve{'ccode'}=$res->{'ccode'};
-    $reserve{'barcode'}=$res->{'barcode'};
-    warn "retour barcode : ".$res->{'barcode'};
-    $reserve{'branchloop'address@hidden;
-    $reserve{'optionloop'address@hidden;
+    $reserve{'date'}           = format_date( $res->{'reservedate'} );
+    $reserve{'borrowernumber'} = $res->{'borrowernumber'};
+    $reserve{'biblionumber'}   = $res->{'biblionumber'};
+    $reserve{'borrowernumber'} = $res->{'borrowernumber'};
+    $reserve{'firstname'}      = $res->{'firstname'};
+    $reserve{'surname'}        = $res->{'surname'};
+    $reserve{'borrowernumber'} = $res->{'borrowernumber'};
+    $reserve{'notes'}          = $res->{'reservenotes'};
+    $reserve{'wait'}           =
+      ( ( $res->{'found'} eq 'W' ) or ( $res->{'priority'} eq '0' ) );
+    $reserve{'constrainttypea'} = ( $res->{'constrainttype'} eq 'a' );
+    $reserve{'constrainttypeo'} = ( $res->{'constrainttype'} eq 'o' );
+    $reserve{'voldesc'}         = $res->{'volumeddesc'};
+    $reserve{'ccode'}           = $res->{'ccode'};
+    $reserve{'barcode'}         = $res->{'barcode'};
+    warn "retour barcode : " . $res->{'barcode'};
+    $reserve{'branchloop'} = address@hidden;
+    $reserve{'optionloop'} = address@hidden;
 
-    push(@reserveloop,\%reserve);
+    push( @reserveloop, \%reserve );
 }
 
 my $default = C4::Context->userenv->{branch};
 my @values;
 my %label_of;
 
-foreach my $branchcode (keys %{$branches}) {
+foreach my $branchcode ( keys %{$branches} ) {
     push @values, $branchcode;
     $label_of{$branchcode} = $branches->{$branchcode}->{branchname};
 }
@@ -404,19 +405,20 @@
 
 # setup colors
 $template->param(
-    optionloop =>address@hidden,
+    optionloop        => address@hidden,
     bibitemloop => address@hidden,
     date => $date,
     biblionumber => $biblionumber,
     findborrower => $findborrower,
     cardnumber => $cardnumber,
     CGIselectborrower => $CGIselectborrower,
-    title =>$dat->{title},
-    author =>$dat->{author}
+    title             => $dat->{title},
+    author            => $dat->{author}
 );
 
 # printout the page
 print $input->header(
-       -type => C4::Interface::CGI::Output::guesstype($template->output),
-       -expires=>'now'
-), $template->output;
\ No newline at end of file
+    -type    => C4::Interface::CGI::Output::guesstype( $template->output ),
+    -expires => 'now'
+  ),
+  $template->output;