[Koha-cvs] koha C4/Circulation/Circ2.pm C4/Reserves2.pm ci... [rel_3_0]

[LAURIN arnaud]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     LAURIN arnaud <alaurin> 07/02/02 09:57:47

Modified files:
        C4/Circulation : Circ2.pm 
        C4             : Reserves2.pm 
        circ           : returns.pl 

Log message:
        bugfixing for Minuspriority process ...., and remove warn compilation

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Circulation/Circ2.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.114.2.35&r2=1.114.2.36
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Reserves2.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.46.2.15&r2=1.46.2.16
http://cvs.savannah.gnu.org/viewcvs/koha/circ/returns.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.43.2.13&r2=1.43.2.14

Patches:
Index: C4/Circulation/Circ2.pm
===================================================================
RCS file: /sources/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.114.2.35
retrieving revision 1.114.2.36
diff -u -b -r1.114.2.35 -r1.114.2.36
--- C4/Circulation/Circ2.pm     25 Jan 2007 18:06:52 -0000      1.114.2.35
+++ C4/Circulation/Circ2.pm     2 Feb 2007 09:57:46 -0000       1.114.2.36
@@ -17,7 +17,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: Circ2.pm,v 1.114.2.35 2007/01/25 18:06:52 alaurin Exp $
+# $Id: Circ2.pm,v 1.114.2.36 2007/02/02 09:57:46 alaurin Exp $
 
 use strict;
 require Exporter;
@@ -41,7 +41,7 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.114.2.35 $' =~ /\d+/g; 
shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.114.2.36 $' =~ /\d+/g; 
shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); };
 
 =head1 NAME
 
@@ -590,11 +590,6 @@
     $fbr = $dbh->quote($fbr);
     $tbr = $dbh->quote($tbr);
     
-    warn "entree dans dotransfer";
-    warn "item dt->".$itm;
-    warn "from fbr->".$fbr;
-    warn "item tbr->".$tbr;
-
     #new entry in branchtransfers....
     $dbh->do(
 "INSERT INTO branchtransfers (itemnumber, frombranch, datesent, tobranch)
@@ -1572,7 +1567,6 @@
        C4::Context->userenv->{'branch'} )
         {
                
UpdateHoldingbranch(C4::Context->userenv->{'branch'},$iteminformation->{'itemnumber'});
-               warn "changement holdingbranch 
->".C4::Context->userenv->{'branch'};
         }
         
     itemseen( $iteminformation->{'itemnumber'} );

Index: C4/Reserves2.pm
===================================================================
RCS file: /sources/koha/koha/C4/Reserves2.pm,v
retrieving revision 1.46.2.15
retrieving revision 1.46.2.16
diff -u -b -r1.46.2.15 -r1.46.2.16
--- C4/Reserves2.pm     25 Jan 2007 18:06:52 -0000      1.46.2.15
+++ C4/Reserves2.pm     2 Feb 2007 09:57:47 -0000       1.46.2.16
@@ -20,7 +20,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: Reserves2.pm,v 1.46.2.15 2007/01/25 18:06:52 alaurin Exp $
+# $Id: Reserves2.pm,v 1.46.2.16 2007/02/02 09:57:47 alaurin Exp $
 
 use strict;
 require Exporter;
@@ -33,7 +33,7 @@
 my $library_name = C4::Context->preference("LibraryName");
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.46.2.15 $' =~ /\d+/g; shift(@v) . "." . 
join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.46.2.16 $' =~ /\d+/g; shift(@v) . "." . 
join( "_", map { sprintf "%03d", $_ } @v ); };
 
 =head1 NAME
 
@@ -113,7 +113,6 @@
 
 #'
 sub OtherReserves {
-warn "entree en mode Other reserves";
     my ($itemnumber) = @_;
     my $messages;
     my $nextreservinfo;
@@ -179,16 +178,16 @@
     my $sth_upd = $dbh->prepare($query);
     $sth_upd->execute( $itemnumber, $borrowernumber, $biblionumber );
     $sth_upd->finish;
-warn "entree en mode minuspriority";
     # second step update all others reservs
     $query = qq/
         SELECT priority,borrowernumber,biblionumber,reservedate
         FROM   reserves
         WHERE  priority !='0'
+       AND biblionumber = ?
           AND  cancellationdate IS NULL
     /;
     my $sth_oth = $dbh->prepare($query);
-    $sth_oth->execute;
+    $sth_oth->execute($biblionumber);
     while ( my ( $priority, $borrowernumber, $biblionumber, $reservedate ) =
         $sth_oth->fetchrow_array )
     {
@@ -387,7 +386,6 @@
             # reserved by same person on same day
             my $bdata;
             if ( $count > 1 ) {
-                warn "bibitemno $bibitemno[$i]";
                 $bdata = GetBiblioItemData( $bibitemno[$i] );
                 $i++;
             }
@@ -681,7 +679,6 @@
 sub FillReserve {
     my ($res) = @_;
     my $dbh = C4::Context->dbh;
-warn "entree en mode fill reserve";
     # fill in a reserve record....
     my $qbiblio = $res->{'biblionumber'};
     my $borr    = $res->{'borrowernumber'};
@@ -736,9 +733,7 @@
 sub FixPriority {
     my ( $biblio, $borrowernumber, $rank ) = @_;
     my $dbh = C4::Context->dbh;
-warn "mode fixpriority : rang retour : ".$rank;
      if ( $rank eq "del" ) {
-     warn "mode suppresion ok";
          CancelReserve( $biblio, undef, $borrowernumber );
      }
     if ( $rank eq "W" || $rank eq "0" ) {
@@ -825,7 +820,6 @@
 =cut
 
 sub ReserveWaiting {
-warn "entree dans reserves waiting";
     my ( $item, $borr,$diffBranchSend ) = @_;
     my $dbh = C4::Context->dbh;
 
@@ -851,7 +845,6 @@
 
     # update reserves record....
     if ($diffBranchSend) {
-    warn "diffbranchsend";
     $query = qq/
         UPDATE reserves
         SET    priority = 0,
@@ -862,7 +855,6 @@
     /;
     }
     else {
-    warn"statut waiting pour la reservation";
     $query = qq/
         UPDATE reserves
         SET    priority = 0,
@@ -968,7 +960,6 @@
     }
     $sth->finish;
     return @results;
-    warn "entree en mode group reserves";
 }
 
 =item CreateReserve

Index: circ/returns.pl
===================================================================
RCS file: /sources/koha/koha/circ/returns.pl,v
retrieving revision 1.43.2.13
retrieving revision 1.43.2.14
diff -u -b -r1.43.2.13 -r1.43.2.14
--- circ/returns.pl     25 Jan 2007 18:06:52 -0000      1.43.2.13
+++ circ/returns.pl     2 Feb 2007 09:57:47 -0000       1.43.2.14
@@ -111,7 +111,6 @@
 
 
 if ( $query->param('resbarcode') ) {
-warn "entree en mode resbarcode";
     my $item           = $query->param('itemnumber');
     my $borrowernumber = $query->param('borrowernumber');
     my $resbarcode     = $query->param('resbarcode');
@@ -119,16 +118,13 @@
     # set to waiting....
     my $iteminfo   = getiteminformation($item);
     my $diffBranchSend;
-    warn "diffbranch retour ->".$diffBranchReturned;
     
 #     addin in ReserveWaiting the possibility to check if the document is 
expected in this library or not,
 # if not we send a value in reserve waiting for not implementting waiting 
status
        if ($diffBranchReturned) {
-       warn "entrer en mod retour diffbranch";
        $diffBranchSend = $diffBranchReturned;
        }
        else {
-       warn "pas de diffbranch";
        $diffBranchSend = undef;
        }
                 
@@ -168,7 +164,6 @@
 
 # actually return book and prepare item table.....
 if ($barcode) {
-warn "entrée en mode barcode";
     # decode cuecat
     $barcode = cuecatbarcodedecode($barcode);
     ( $returned, $messages, $iteminformation, $borrower ) =
@@ -337,7 +332,6 @@
             $template->param( intransit => 1 );
         }
 
-        warn "RES FOR : " . $res->{'branchcode'};
         $template->param(
             found          => 1,
             currentbranch  => 
$branches->{C4::Context->userenv->{'branch'}}->{'branchname'},