koha-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Koha-cvs] koha C4/Circulation.pm C4/Members.pm circ/branc...


From: paul poulain
Subject: [Koha-cvs] koha C4/Circulation.pm C4/Members.pm circ/branc...
Date: Mon, 23 Apr 2007 14:08:48 +0000

CVSROOT:        /sources/koha
Module name:    koha
Changes by:     paul poulain <tipaul>   07/04/23 14:08:48

Modified files:
        C4             : Circulation.pm Members.pm 
        circ           : branchreserves.pl branchtransfers.pl 
                         circulation.pl currenttransfers.pl returns.pl 
                         waitingreservestransfers.pl 
        members        : moremember.pl 
        opac           : opac-reserve.pl opac-user.pl 
        reserve        : modrequest.pl placerequest.pl request.pl 
        serials        : routing-preview.pl 
Added files:
        C4             : Reserves.pm 
Removed files:
        C4             : Reserves2.pm 

Log message:
        moving Reserves2.pm to Reserves.pm

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Circulation.pm?cvsroot=koha&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Members.pm?cvsroot=koha&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Reserves.pm?cvsroot=koha&rev=1.8
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Reserves2.pm?cvsroot=koha&r1=1.54&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/circ/branchreserves.pl?cvsroot=koha&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/koha/circ/branchtransfers.pl?cvsroot=koha&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/koha/circ/circulation.pl?cvsroot=koha&r1=1.106&r2=1.107
http://cvs.savannah.gnu.org/viewcvs/koha/circ/currenttransfers.pl?cvsroot=koha&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/koha/circ/returns.pl?cvsroot=koha&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/koha/circ/waitingreservestransfers.pl?cvsroot=koha&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/koha/members/moremember.pl?cvsroot=koha&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-reserve.pl?cvsroot=koha&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-user.pl?cvsroot=koha&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/koha/reserve/modrequest.pl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/reserve/placerequest.pl?cvsroot=koha&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/koha/reserve/request.pl?cvsroot=koha&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/koha/serials/routing-preview.pl?cvsroot=koha&r1=1.6&r2=1.7

Patches:
Index: C4/Circulation.pm
===================================================================
RCS file: /sources/koha/koha/C4/Circulation.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- C4/Circulation.pm   23 Apr 2007 13:17:52 -0000      1.16
+++ C4/Circulation.pm   23 Apr 2007 14:08:47 -0000      1.17
@@ -17,16 +17,16 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: Circulation.pm,v 1.16 2007/04/23 13:17:52 tipaul Exp $
+# $Id: Circulation.pm,v 1.17 2007/04/23 14:08:47 tipaul Exp $
 
 use strict;
 require Exporter;
 use C4::Context;
 use C4::Stats;
-use C4::Reserves2;
+use C4::Reserves;
 use C4::Koha;
 use C4::Biblio;
-use C4::Reserves2;
+use C4::Reserves;
 use C4::Members;
 use C4::Date;
 use Date::Calc qw(
@@ -43,7 +43,7 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.16 $' =~ /\d+/g; shift(@v).".".join( 
"_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.17 $' =~ /\d+/g; shift(@v).".".join( 
"_", map { sprintf "%03d", $_ } @v ); };
 
 =head1 NAME
 
@@ -1173,19 +1173,6 @@
 
 =cut
 
-# FIXME - This API is bogus. There's no need to return $borrower and
-# $iteminformation; the caller can ask about those separately, if it
-# cares (it'd be inefficient to make two database calls instead of
-# one, but &GetMemberDetails and &getiteminformation can be
-# memoized if this is an issue).
-#
-# The ($doreturn, $messages) tuple is redundant: if the return
-# succeeded, that's all the caller needs to know. So &AddReturn can
-# return 1 and 0 on success and failure, and set
-# $C4::Circulation::Circ2::errmsg to indicate the error. Or it can
-# return undef for success, and an error message on error (though this
-# is more C-ish than Perl-ish).
-
 sub AddReturn {
     my ( $barcode, $branch ) = @_;
     my $dbh      = C4::Context->dbh;
@@ -1230,7 +1217,7 @@
         if ($doreturn) {
             my $sth =
             $dbh->prepare(
-    "update issues set returndate = now() where (borrowernumber = ?) and 
(itemnumber = ?) and (returndate is null)"
+    "UPDATE issues SET returndate = now() WHERE (borrowernumber = ?) AND 
(itemnumber = ?) AND (returndate IS NULL)"
             );
             $sth->execute( $borrower->{'borrowernumber'},
                 $iteminformation->{'itemnumber'} );
@@ -1263,7 +1250,7 @@
             if ( $tobranch eq C4::Context->userenv->{'branch'} ) {
                     my $sth =
                     $dbh->prepare(
-                            "update branchtransfers set datearrived = now() 
where itemnumber= ? AND datearrived IS NULL"
+                            "UPDATE branchtransfers SET datearrived = now() 
WHERE itemnumber= ? AND datearrived IS NULL"
                     );
                     $sth->execute( $iteminformation->{'itemnumber'} );
                     $sth->finish;

Index: C4/Members.pm
===================================================================
RCS file: /sources/koha/koha/C4/Members.pm,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- C4/Members.pm       23 Apr 2007 13:10:08 -0000      1.43
+++ C4/Members.pm       23 Apr 2007 14:08:47 -0000      1.44
@@ -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: Members.pm,v 1.43 2007/04/23 13:10:08 hdl Exp $
+# $Id: Members.pm,v 1.44 2007/04/23 14:08:47 tipaul Exp $
 
 use strict;
 require Exporter;
@@ -27,11 +27,11 @@
 use Date::Calc qw/Today Add_Delta_YM/;
 use C4::Log; # logaction
 use C4::Overdues;
-use C4::Reserves2;
+use C4::Reserves;
 
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
 
-$VERSION = do { my @v = '$Revision: 1.43 $' =~ /\d+/g; shift(@v) . "." . join( 
"_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.44 $' =~ /\d+/g; shift(@v) . "." . join( 
"_", map { sprintf "%03d", $_ } @v ); };
 
 =head1 NAME
 

Index: circ/branchreserves.pl
===================================================================
RCS file: /sources/koha/koha/circ/branchreserves.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- circ/branchreserves.pl      18 Apr 2007 17:00:14 -0000      1.8
+++ circ/branchreserves.pl      23 Apr 2007 14:08:47 -0000      1.9
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: branchreserves.pl,v 1.8 2007/04/18 17:00:14 tipaul Exp $
+# $Id: branchreserves.pl,v 1.9 2007/04/23 14:08:47 tipaul Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -35,7 +35,7 @@
   Add_Delta_Days
   Date_to_Days
 );
-use C4::Reserves2;
+use C4::Reserves;
 use C4::Koha;
 use C4::Interface::CGI::Output;
 

Index: circ/branchtransfers.pl
===================================================================
RCS file: /sources/koha/koha/circ/branchtransfers.pl,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- circ/branchtransfers.pl     17 Apr 2007 16:24:59 -0000      1.29
+++ circ/branchtransfers.pl     23 Apr 2007 14:08:47 -0000      1.30
@@ -25,7 +25,7 @@
 use CGI;
 use C4::Circulation;
 use C4::Output;
-use C4::Reserves2;
+use C4::Reserves;
 use C4::Biblio;
 use C4::Auth;
 use C4::Interface::CGI::Output;

Index: circ/circulation.pl
===================================================================
RCS file: /sources/koha/koha/circ/circulation.pl,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -b -r1.106 -r1.107
--- circ/circulation.pl 23 Apr 2007 13:10:08 -0000      1.106
+++ circ/circulation.pl 23 Apr 2007 14:08:47 -0000      1.107
@@ -42,7 +42,7 @@
 use C4::Circulation;
 use C4::Members;
 use C4::Biblio;
-use C4::Reserves2;
+use C4::Reserves;
 
 #
 # PARAMETERS READING

Index: circ/currenttransfers.pl
===================================================================
RCS file: /sources/koha/koha/circ/currenttransfers.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- circ/currenttransfers.pl    18 Apr 2007 17:00:14 -0000      1.8
+++ circ/currenttransfers.pl    23 Apr 2007 14:08:47 -0000      1.9
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: currenttransfers.pl,v 1.8 2007/04/18 17:00:14 tipaul Exp $
+# $Id: currenttransfers.pl,v 1.9 2007/04/23 14:08:47 tipaul Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -37,7 +37,7 @@
 );
 
 use C4::Koha;
-use C4::Reserves2;
+use C4::Reserves;
 
 my $input = new CGI;
 

Index: circ/returns.pl
===================================================================
RCS file: /sources/koha/koha/circ/returns.pl,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- circ/returns.pl     18 Apr 2007 17:00:14 -0000      1.49
+++ circ/returns.pl     23 Apr 2007 14:08:47 -0000      1.50
@@ -31,7 +31,7 @@
 use C4::Date;
 use C4::Output;
 use C4::Print;
-use C4::Reserves2;
+use C4::Reserves;
 use C4::Auth;
 use C4::Biblio;
 use C4::Members;

Index: circ/waitingreservestransfers.pl
===================================================================
RCS file: /sources/koha/koha/circ/waitingreservestransfers.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- circ/waitingreservestransfers.pl    18 Apr 2007 17:00:14 -0000      1.10
+++ circ/waitingreservestransfers.pl    23 Apr 2007 14:08:47 -0000      1.11
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: waitingreservestransfers.pl,v 1.10 2007/04/18 17:00:14 tipaul Exp $
+# $Id: waitingreservestransfers.pl,v 1.11 2007/04/23 14:08:47 tipaul Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -27,7 +27,7 @@
 use C4::Auth;
 use C4::Date;
 use C4::Circulation;
-use C4::Reserves2;
+use C4::Reserves;
 use C4::Members;
 use Date::Calc qw(
   Today

Index: members/moremember.pl
===================================================================
RCS file: /sources/koha/koha/members/moremember.pl,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- members/moremember.pl       23 Apr 2007 13:10:08 -0000      1.33
+++ members/moremember.pl       23 Apr 2007 14:08:47 -0000      1.34
@@ -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: moremember.pl,v 1.33 2007/04/23 13:10:08 hdl Exp $
+# $Id: moremember.pl,v 1.34 2007/04/23 14:08:47 tipaul Exp $
 
 =head1 moremember.pl
 
@@ -42,7 +42,7 @@
 use C4::Members;
 use Date::Manip;
 use C4::Date;
-use C4::Reserves2;
+use C4::Reserves;
 use C4::Circulation;
 use C4::Koha;
 use C4::Letters;

Index: opac/opac-reserve.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-reserve.pl,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- opac/opac-reserve.pl        4 Apr 2007 16:46:23 -0000       1.31
+++ opac/opac-reserve.pl        23 Apr 2007 14:08:47 -0000      1.32
@@ -22,7 +22,7 @@
 use C4::Auth;    # checkauth, getborrowernumber.
 use C4::Koha;
 use C4::Circulation;
-use C4::Reserves2;
+use C4::Reserves;
 use C4::Interface::CGI::Output;
 use C4::Date;
 use C4::Context;

Index: opac/opac-user.pl
===================================================================
RCS file: /sources/koha/koha/opac/opac-user.pl,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- opac/opac-user.pl   23 Apr 2007 13:10:08 -0000      1.27
+++ opac/opac-user.pl   23 Apr 2007 14:08:47 -0000      1.28
@@ -15,7 +15,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: opac-user.pl,v 1.27 2007/04/23 13:10:08 hdl Exp $
+# $Id: opac-user.pl,v 1.28 2007/04/23 14:08:47 tipaul Exp $
 
 use strict;
 require Exporter;
@@ -24,7 +24,7 @@
 use C4::Auth;
 use C4::Koha;
 use C4::Circulation;
-use C4::Reserves2;
+use C4::Reserves;
 use C4::Members;
 use C4::Interface::CGI::Output;
 use C4::Biblio;

Index: reserve/modrequest.pl
===================================================================
RCS file: /sources/koha/koha/reserve/modrequest.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- reserve/modrequest.pl       9 Mar 2007 15:13:57 -0000       1.4
+++ reserve/modrequest.pl       23 Apr 2007 14:08:47 -0000      1.5
@@ -25,7 +25,7 @@
 use strict;
 use CGI;
 use C4::Output;
-use C4::Reserves2;
+use C4::Reserves;
 
 my $input = new CGI;
 #print $input->header;

Index: reserve/placerequest.pl
===================================================================
RCS file: /sources/koha/koha/reserve/placerequest.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- reserve/placerequest.pl     23 Apr 2007 13:10:08 -0000      1.8
+++ reserve/placerequest.pl     23 Apr 2007 14:08:47 -0000      1.9
@@ -25,7 +25,7 @@
 use C4::Biblio;
 use CGI;
 use C4::Output;
-use C4::Reserves2;
+use C4::Reserves;
 use C4::Circulation;
 use C4::Members;
 

Index: reserve/request.pl
===================================================================
RCS file: /sources/koha/koha/reserve/request.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- reserve/request.pl  23 Apr 2007 13:10:08 -0000      1.11
+++ reserve/request.pl  23 Apr 2007 14:08:47 -0000      1.12
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: request.pl,v 1.11 2007/04/23 13:10:08 hdl Exp $
+# $Id: request.pl,v 1.12 2007/04/23 14:08:47 tipaul Exp $
 
 #writen 2/1/00 by address@hidden
 # Copyright 2000-2002 Katipo Communications
@@ -34,7 +34,7 @@
 use C4::Output;
 use C4::Interface::CGI::Output;
 use C4::Auth;
-use C4::Reserves2;
+use C4::Reserves;
 use C4::Biblio;
 use C4::Koha;
 use C4::Circulation;

Index: serials/routing-preview.pl
===================================================================
RCS file: /sources/koha/koha/serials/routing-preview.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- serials/routing-preview.pl  23 Apr 2007 13:10:08 -0000      1.6
+++ serials/routing-preview.pl  23 Apr 2007 14:08:47 -0000      1.7
@@ -10,7 +10,7 @@
 use C4::Date;
 use C4::Output;
 use C4::Acquisition;
-use C4::Reserves2;
+use C4::Reserves;
 use C4::Circulation;
 use C4::Interface::CGI::Output;
 use C4::Context;

Index: C4/Reserves.pm
===================================================================
RCS file: C4/Reserves.pm
diff -N C4/Reserves.pm
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ C4/Reserves.pm      23 Apr 2007 14:08:47 -0000      1.8
@@ -0,0 +1,1452 @@
+# -*- tab-width: 8 -*-
+# NOTE: This file uses standard 8-character tabs
+
+package C4::Reserves;
+
+# Copyright 2000-2002 Katipo Communications
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA  02111-1307 USA
+
+# $Id: Reserves.pm,v 1.8 2007/04/23 14:08:47 tipaul Exp $
+
+use strict;
+require Exporter;
+use C4::Context;
+use C4::Biblio;
+use C4::Search;
+use C4::Circulation;
+
+use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
+my $library_name = C4::Context->preference("LibraryName");
+
+# set the version for version checking
+$VERSION = do { my @v = '$Revision: 1.8 $' =~ /\d+/g; shift(@v) . "." . join( 
"_", map { sprintf "%03d", $_ } @v ); };
+
+=head1 NAME
+
+C4::Reserves2 - Koha functions for dealing with reservation.
+
+=head1 SYNOPSIS
+
+  use C4::Reserves;
+
+=head1 DESCRIPTION
+
+this modules provides somes functions to deal with reservations.
+
+=head1 FUNCTIONS
+
+=over 2
+
+=cut
+
address@hidden = qw(Exporter);
+
address@hidden = qw(
+  &FindReserves
+  &CheckReserves
+  &GetWaitingReserves
+  &CancelReserve
+  &CalcReserveFee
+  &FillReserve
+  &ReserveWaiting
+  &CreateReserve
+  &UpdateReserve
+  &GetReserveTitle
+  &GetReservations
+  &SetWaitingStatus
+  &GlobalCancel
+  &MinusPriority
+  &OtherReserves
+  &GetFirstReserveDateFromItem
+  &CountReservesFromBorrower
+  &FixPriority
+  &FindReservesInQueue
+  GetReservesForBranch
+  GetReservesToBranch
+);
+
+# make all your functions, whether exported or not;
+
+=item GlobalCancel
+
+($messages,$nextreservinfo) = &GlobalCancel($itemnumber,$borrowernumber);
+
+    New op dev for the circulation based on item, global is a function to 
cancel reserv,check other reserves, and transfer document if it's necessary
+
+=cut
+
+sub GlobalCancel {
+    my $messages;
+    my $nextreservinfo;
+    my ( $itemnumber, $borrowernumber ) = @_;
+
+    #step 1 : cancel the reservation
+    my $CancelReserve = CancelReserve( undef, $itemnumber, $borrowernumber );
+
+    #step 2 launch the subroutine of the others reserves
+    ( $messages, $nextreservinfo ) = OtherReserves($itemnumber);
+
+    return ( $messages, $nextreservinfo );
+}
+
+=item OtherReserves
+
+($messages,$nextreservinfo)=$OtherReserves(itemnumber);
+
+Check queued list of this document and check if this document must be  
transfered
+
+=cut
+
+#'
+sub OtherReserves {
+    my ($itemnumber) = @_;
+    my $messages;
+    my $nextreservinfo;
+    my ( $restype, $checkreserves ) = CheckReserves($itemnumber);
+    if ($checkreserves) {
+        my $iteminfo = GetItem($itemnumber);
+        if ( $iteminfo->{'holdingbranch'} ne $checkreserves->{'branchcode'} ) {
+            $messages->{'transfert'} = $checkreserves->{'branchcode'};
+            #minus priorities of others reservs
+            MinusPriority(
+                $itemnumber,
+                $checkreserves->{'borrowernumber'},
+                $iteminfo->{'biblionumber'}
+            );
+
+            #launch the subroutine dotransfer
+            C4::Circulation::dotransfer(
+                $itemnumber,
+                $iteminfo->{'holdingbranch'},
+                $checkreserves->{'branchcode'}
+              ),
+              ;
+        }
+
+     #step 2b : case of a reservation on the same branch, set the waiting 
status
+        else {
+            $messages->{'waiting'} = 1;
+            MinusPriority(
+                $itemnumber,
+                $checkreserves->{'borrowernumber'},
+                $iteminfo->{'biblionumber'}
+            );
+            SetWaitingStatus($itemnumber);
+        }
+
+        $nextreservinfo = $checkreserves->{'borrowernumber'};
+    }
+
+    return ( $messages, $nextreservinfo );
+}
+
+=item MinusPriority
+
+&MinusPriority($itemnumber,$borrowernumber,$biblionumber)
+
+Reduce the values of queuded list     
+
+=cut
+
+#'
+sub MinusPriority {
+    my ( $itemnumber, $borrowernumber, $biblionumber ) = @_;
+
+    #first step update the value of the first person on reserv
+    my $dbh   = C4::Context->dbh;
+    my $query = "
+        UPDATE reserves
+        SET    priority = 0 , itemnumber = ? 
+        WHERE  cancellationdate IS NULL 
+          AND  borrowernumber=?
+          AND  biblionumber=?
+    ";
+    my $sth_upd = $dbh->prepare($query);
+    $sth_upd->execute( $itemnumber, $borrowernumber, $biblionumber );
+    $sth_upd->finish;
+    # second step update all others reservs
+    $query = "
+        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($biblionumber);
+    while ( my ( $priority, $borrowernumber, $biblionumber, $reservedate ) =
+        $sth_oth->fetchrow_array )
+    {
+        $priority--;
+        $query = "
+             UPDATE reserves
+             SET    priority = ?
+             WHERE  biblionumber = ?
+               AND  borrowernumber   = ?
+               AND  reservedate      = ?
+        ";
+        my $sth_upd_oth = $dbh->prepare($query);
+        $sth_upd_oth->execute( $priority, $biblionumber, $borrowernumber,
+            $reservedate );
+        $sth_upd_oth->finish;
+    }
+    $sth_oth->finish;
+}
+
+=item SetWaitingStatus
+
+&SetWaitingStatus($itemnumber);
+
+we check if we have a reserves with itemnumber (New op system of reserves), if 
we found one, we update the status of the reservation when we have : 'priority' 
= 0, and we have an itemnumber 
+
+=cut
+
+sub SetWaitingStatus {
+
+    #first : check if we have a reservation for this item .
+    my ($itemnumber) = @_;
+    my $dbh          = C4::Context->dbh;
+    my $query        = "
+        SELECT priority,borrowernumber
+        FROM   reserves
+        WHERE  itemnumber=?
+           AND cancellationdate IS NULL
+           AND found IS NULL AND priority='0'
+    ";
+    my $sth_find = $dbh->prepare($query);
+    $sth_find->execute($itemnumber);
+    my ( $priority, $borrowernumber ) = $sth_find->fetchrow_array;
+    $sth_find->finish;
+    return unless $borrowernumber;
+
+# step 2 : if we have a borrowernumber, we update the value found to 'W' to 
notify the borrower
+    $query = "
+    UPDATE reserves
+    SET    found='W',waitingdate = now()
+    WHERE  borrowernumber=?
+      AND itemnumber=?
+      AND found IS NULL
+    ";
+    my $sth_set = $dbh->prepare($query);
+    $sth_set->execute( $borrowernumber, $itemnumber );
+    $sth_set->finish;
+}
+
+=item GetReservations
+
address@hidden&GetReservations($itemnumber,$borrowernumber);
+
+this function get the list of reservation for an C<$itemnumber> or 
C<$borrowernumber>
+given on input arg. You should give $itemnumber OR $borrowernumber but not 
both.
+
+=cut
+
+sub GetReservations {
+    my ( $itemnumber, $borrowernumber ) = @_;
+    if ($itemnumber) {
+        my $dbh   = C4::Context->dbh;
+        my $query = "
+            SELECT reservedate,borrowernumber
+            FROM   reserves
+            WHERE  itemnumber=?
+              AND  cancellationdate IS NULL
+              AND  (found <> 'F' OR found IS NULL)
+        ";
+        my $sth_res = $dbh->prepare($query);
+        $sth_res->execute($itemnumber);
+        my ( $reservedate, $borrowernumber ) = $sth_res->fetchrow_array;
+        return ( $reservedate, $borrowernumber );
+    }
+    if ($borrowernumber) {
+        my $dbh   = C4::Context->dbh;
+        my $query = "
+            SELECT *
+            FROM   reserves
+            WHERE  borrowernumber=?
+              AND  cancellationdate IS NULL
+              AND (found != 'F' or found is null)
+            ORDER BY reservedate
+        ";
+
+        my $sth_find = $dbh->prepare($query);
+        $sth_find->execute($borrowernumber);
+        my @borrowerreserv;
+        while ( my $data = $sth_find->fetchrow_hashref ) {
+            push @borrowerreserv, $data;
+        }
+        return @borrowerreserv;
+    }
+}
+
+=item FindReserves
+
+  $results = &FindReserves($biblionumber, $borrowernumber);
+
+Looks books up in the reserves. C<$biblionumber> is the biblionumber
+of the book to look up. C<$borrowernumber> is the borrower number of a
+patron whose books to look up.
+
+Either C<$biblionumber> or C<$borrowernumber> may be the empty string,
+but not both. If both are specified, C<&FindReserves> looks up the
+given book for the given patron. If only C<$biblionumber> is
+specified, C<&FindReserves> looks up that book for all patrons. If
+only C<$borrowernumber> is specified, C<&FindReserves> looks up all of
+that patron's reserves. If neither is specified, C<&FindReserves>
+barfs.
+
+For each book thus found, C<&FindReserves> checks the reserve
+constraints and does something I don't understand.
+
+C<&FindReserves> returns a two-element array:
+
+C<$results> is a reference to an array of references of hashes. Each hash
+has for keys a list of column from reserves table (see details in function).
+
+=cut
+
+#'
+sub FindReserves {
+    my ( $biblionumber, $bor ) = @_;
+    my $dbh = C4::Context->dbh;
+    my @bind;
+
+    # Find the desired items in the reserves
+    my $query = "
+        SELECT  branchcode,
+                timestamp AS rtimestamp,
+                priority,
+                biblionumber,
+                borrowernumber,
+                reservedate,
+                constrainttype,
+                found,
+                itemnumber
+          FROM     reserves
+          WHERE     cancellationdate IS NULL
+          AND    (found <> \'F\' OR found IS NULL)
+    ";
+
+    if ( $biblionumber ne '' ) {
+        $query .= '
+            AND biblionumber = ?
+        ';
+        push @bind, $biblionumber;
+    }
+
+    if ( $bor ne '' ) {
+        $query .= '
+            AND borrowernumber = ?
+        ';
+        push @bind, $bor;
+    }
+
+    $query .= '
+          ORDER BY priority
+    ';
+    my $sth = $dbh->prepare($query);
+    $sth->execute(@bind);
+    my @results;
+    my $i = 0;
+    while ( my $data = $sth->fetchrow_hashref ) {
+
+        # FIXME - What is this if-statement doing? How do constraints work?
+        if ( $data->{constrainttype} eq 'o' ) {
+            $query = '
+                SELECT biblioitemnumber
+                FROM reserveconstraints
+                WHERE biblionumber   = ?
+                    AND borrowernumber = ?
+                  AND reservedate    = ?
+            ';
+            my $csth = $dbh->prepare($query);
+            $csth->execute( $data->{biblionumber}, $data->{borrowernumber},
+                $data->{reservedate}, );
+
+            my @bibitemno;
+            while ( my $bibitemnos = $csth->fetchrow_array ) {
+                push( @bibitemno, $bibitemnos );
+            }
+            my $count = @bibitemno;
+
+            # if we have two or more different specific itemtypes
+            # reserved by same person on same day
+            my $bdata;
+            if ( $count > 1 ) {
+                $bdata = GetBiblioItemData( $bibitemno[$i] );
+                $i++;
+            }
+            else {
+
+                # Look up the book we just found.
+                $bdata = GetBiblioItemData( $bibitemno[0] );
+            }
+            $csth->finish;
+
+            # Add the results of this latest search to the current
+            # results.
+            # FIXME - An 'each' would probably be more efficient.
+            foreach my $key ( keys %$bdata ) {
+                $data->{$key} = $bdata->{$key};
+            }
+        }
+        push @results, $data;
+    }
+    $sth->finish;
+
+    return ( $#results + 1, address@hidden );
+}
+
+#-------------------------------------------------------------------------------------
+
+=item CountReservesFromBorrower
+
+$number = &CountReservesFromBorrower($borrowernumber);
+
+this function returns the number of reservation for a borrower given on input 
arg.
+
+=cut
+
+sub CountReservesFromBorrower {
+    my ($borrowernumber) = @_;
+
+    my $dbh = C4::Context->dbh;
+
+    my $query = '
+        SELECT COUNT(*) AS counter
+        FROM reserves
+          WHERE borrowernumber = ?
+          AND cancellationdate IS NULL
+          AND (found != \'F\' OR found IS NULL)
+    ';
+    my $sth = $dbh->prepare($query);
+    $sth->execute($borrowernumber);
+    my $row = $sth->fetchrow_hashref;
+    $sth->finish;
+
+    return $row->{counter};
+}
+
+#-------------------------------------------------------------------------------------
+
+=item GetFirstReserveDateFromItem
+
+$date = GetFirstReserveDateFromItem($itemnumber)
+
+this function returns the first date a item has been reserved.
+
+=cut
+
+sub GetFirstReserveDateFromItem {
+    my ($itemnumber) = @_;
+
+    my $dbh = C4::Context->dbh;
+
+    my $query = '
+        SELECT reservedate,
+        borrowernumber,
+        branchcode
+        FROM   reserves
+        WHERE  itemnumber = ?
+          AND  cancellationdate IS NULL
+          AND (found != \'F\' OR found IS NULL)
+    ';
+    my $sth = $dbh->prepare($query);
+    $sth->execute($itemnumber);
+    my $row = $sth->fetchrow_hashref;
+
+    return ($row->{reservedate},$row->{borrowernumber},$row->{branchcode});
+}
+
+#-------------------------------------------------------------------------------------
+
+=item CheckReserves
+
+  ($status, $reserve) = &CheckReserves($itemnumber, $barcode);
+
+Find a book in the reserves.
+
+C<$itemnumber> is the book's item number. C<$barcode> is its barcode.
+Either one, but not both, may be false. If both are specified,
+C<&CheckReserves> uses C<$itemnumber>.
+
+$itemnubmer can be false, in which case uses the barcode. (Never uses
+both. $itemnumber gets priority).
+
+As I understand it, C<&CheckReserves> looks for the given item in the
+reserves. If it is found, that's a match, and C<$status> is set to
+C<Waiting>.
+
+Otherwise, it finds the most important item in the reserves with the
+same biblio number as this book (I'm not clear on this) and returns it
+with C<$status> set to C<Reserved>.
+
+C<&CheckReserves> returns a two-element list:
+
+C<$status> is either C<Waiting>, C<Reserved> (see above), or 0.
+
+C<$reserve> is the reserve item that matched. It is a
+reference-to-hash whose keys are mostly the fields of the reserves
+table in the Koha database.
+
+=cut
+
+#'
+sub CheckReserves {
+    my ( $item, $barcode ) = @_;
+    my $dbh = C4::Context->dbh;
+    my $sth;
+    if ($item) {
+        my $qitem = $dbh->quote($item);
+        # Look up the item by itemnumber
+        my $query = "
+            SELECT items.biblionumber, items.biblioitemnumber, 
itemtypes.notforloan
+            FROM   items, biblioitems, itemtypes
+            WHERE  items.biblioitemnumber = biblioitems.biblioitemnumber
+               AND biblioitems.itemtype = itemtypes.itemtype
+               AND itemnumber=$qitem
+        ";
+        $sth = $dbh->prepare($query);
+    }
+    else {
+        my $qbc = $dbh->quote($barcode);
+        # Look up the item by barcode
+        my $query = "
+            SELECT items.biblionumber, items.biblioitemnumber, 
itemtypes.notforloan
+            FROM   items, biblioitems, itemtypes
+            WHERE  items.biblioitemnumber = biblioitems.biblioitemnumber
+              AND biblioitems.itemtype = itemtypes.itemtype
+              AND barcode=$qbc
+        ";
+        $sth = $dbh->prepare($query);
+
+        # FIXME - This function uses $item later on. Ought to set it here.
+    }
+    $sth->execute;
+    my ( $biblio, $bibitem, $notforloan ) = $sth->fetchrow_array;
+    $sth->finish;
+
+    # if item is not for loan it cannot be reserved either.....
+    return ( 0, 0 ) if $notforloan;
+
+    # get the reserves...
+    # Find this item in the reserves
+    my @reserves = Findgroupreserve( $bibitem, $biblio );
+    my $count    = scalar @reserves;
+
+    # $priority and $highest are used to find the most important item
+    # in the list returned by &Findgroupreserve. (The lower $priority,
+    # the more important the item.)
+    # $highest is the most important item we've seen so far.
+    my $priority = 10000000;
+    my $highest;
+    if ($count) {
+        foreach my $res (@reserves) {
+            # FIXME - $item might be undefined or empty: the caller
+            # might be searching by barcode.
+            if ( $res->{'itemnumber'} == $item ) {
+                # Found it
+                return ( "Waiting", $res );
+            }
+            else {
+                # See if this item is more important than what we've got
+                # so far.
+                if ( $res->{'priority'} != 0 && $res->{'priority'} < $priority 
)
+                {
+                    $priority = $res->{'priority'};
+                    $highest  = $res;
+                }
+            }
+        }
+    }
+
+    # If we get this far, then no exact match was found. Print the
+    # most important item on the list. I think this tells us who's
+    # next in line to get this book.
+    if ($highest) {    # FIXME - $highest might be undefined
+        $highest->{'itemnumber'} = $item;
+        return ( "Reserved", $highest );
+    }
+    else {
+        return ( 0, 0 );
+    }
+}
+
+#-------------------------------------------------------------------------------------
+
+=item CancelReserve
+
+  &CancelReserve($biblionumber, $itemnumber, $borrowernumber);
+
+Cancels a reserve.
+
+Use either C<$biblionumber> or C<$itemnumber> to specify the item to
+cancel, but not both: if both are given, C<&CancelReserve> does
+nothing.
+
+C<$borrowernumber> is the borrower number of the patron on whose
+behalf the book was reserved.
+
+If C<$biblionumber> was given, C<&CancelReserve> also adjusts the
+priorities of the other people who are waiting on the book.
+
+=cut
+
+#'
+sub CancelReserve {
+    my ( $biblio, $item, $borr ) = @_;
+    my $dbh = C4::Context->dbh;
+        if ( ( $item and $borr ) and ( not $biblio ) ) {
+        # removing a waiting reserve record....
+        # update the database...
+        my $query = "
+            UPDATE reserves
+            SET    cancellationdate = now(),
+                   found            = Null,
+                   priority         = 0
+            WHERE  itemnumber       = ?
+             AND   borrowernumber   = ?
+        ";
+        my $sth = $dbh->prepare($query);
+        $sth->execute( $item, $borr );
+        $sth->finish;
+    }
+    if ( ( $biblio and $borr ) and ( not $item ) ) {
+        # removing a reserve record....
+        # get the prioritiy on this record....
+        my $priority;
+        my $query = qq/
+            SELECT priority FROM reserves
+            WHERE biblionumber   = ?
+              AND borrowernumber = ?
+              AND cancellationdate IS NULL
+              AND itemnumber IS NULL
+              AND (found <> 'F' OR found IS NULL)
+        /;
+        my $sth = $dbh->prepare($query);
+        $sth->execute( $biblio, $borr );
+        ($priority) = $sth->fetchrow_array;
+        $sth->finish;
+        $query = qq/
+            UPDATE reserves
+            SET    cancellationdate = now(),
+                   found            = Null,
+                   priority         = 0
+            WHERE  biblionumber     = ?
+              AND  borrowernumber   = ?
+              AND cancellationdate IS NULL
+              AND (found <> 'F' or found IS NULL)
+        /;
+
+        # update the database, removing the record...
+        $sth = $dbh->prepare($query);
+        $sth->execute( $biblio, $borr );
+        $sth->finish;
+
+        # now fix the priority on the others....
+        FixPriority( $priority, $biblio );
+    }
+}
+
+#-------------------------------------------------------------------------------------
+
+=item FillReserve
+
+  &FillReserve($reserve);
+
+Fill a reserve. If I understand this correctly, this means that the
+reserved book has been found and given to the patron who reserved it.
+
+C<$reserve> specifies the reserve to fill. It is a reference-to-hash
+whose keys are fields from the reserves table in the Koha database.
+
+=cut
+
+#'
+sub FillReserve {
+    my ($res) = @_;
+    my $dbh = C4::Context->dbh;
+    # fill in a reserve record....
+    my $qbiblio = $res->{'biblionumber'};
+    my $borr    = $res->{'borrowernumber'};
+    my $resdate = $res->{'reservedate'};
+
+    # get the priority on this record....
+    my $priority;
+    my $query = "SELECT priority
+                 FROM   reserves
+                 WHERE  biblionumber   = ?
+                  AND   borrowernumber = ?
+                  AND   reservedate    = ?";
+    my $sth = $dbh->prepare($query);
+    $sth->execute( $qbiblio, $borr, $resdate );
+    ($priority) = $sth->fetchrow_array;
+    $sth->finish;
+
+    # update the database...
+    $query = "UPDATE reserves
+                  SET    found            = 'F',
+                         priority         = 0
+                 WHERE  biblionumber     = ?
+                    AND reservedate      = ?
+                    AND borrowernumber   = ?
+                ";
+    $sth = $dbh->prepare($query);
+    $sth->execute( $qbiblio, $resdate, $borr );
+    $sth->finish;
+
+    # now fix the priority on the others (if the priority wasn't
+    # already sorted!)....
+    unless ( $priority == 0 ) {
+        FixPriority( $priority, $qbiblio );
+    }
+}
+
+#-------------------------------------------------------------------------------------
+
+=item FixPriority
+
+&FixPriority($biblio,$borrowernumber,$rank);
+
+ Only used internally (so don't export it)
+ Changed how this functions works #
+ Now just gets an array of reserves in the rank order and updates them with
+ the array index (+1 as array starts from 0)
+ and if $rank is supplied will splice item from the array and splice it back 
in again
+ in new priority rank
+
+=cut 
+
+sub FixPriority {
+    my ( $biblio, $borrowernumber, $rank ) = @_;
+    my $dbh = C4::Context->dbh;
+     if ( $rank eq "del" ) {
+         CancelReserve( $biblio, undef, $borrowernumber );
+     }
+    if ( $rank eq "W" || $rank eq "0" ) {
+
+        # make sure priority for waiting items is 0
+        my $query = qq/
+            UPDATE reserves
+            SET    priority = 0
+            WHERE biblionumber = ?
+              AND borrowernumber = ?
+              AND cancellationdate IS NULL
+              AND found ='W'
+        /;
+        my $sth = $dbh->prepare($query);
+        $sth->execute( $biblio, $borrowernumber );
+    }
+    my @priority;
+    my @reservedates;
+
+    # get whats left
+# FIXME adding a new security in returned elements for changing priority,
+# now, we don't care anymore any reservations with itemnumber linked (suppose 
a waiting reserve)
+    my $query = qq/
+        SELECT borrowernumber, reservedate, constrainttype
+        FROM   reserves
+        WHERE  biblionumber   = ?
+          AND  cancellationdate IS NULL
+          AND  itemnumber IS NULL
+          AND  ((found <> 'F' and found <> 'W') or found is NULL)
+        ORDER BY priority ASC
+    /;
+    my $sth = $dbh->prepare($query);
+    $sth->execute($biblio);
+    while ( my $line = $sth->fetchrow_hashref ) {
+        push( @reservedates, $line );
+        push( @priority,     $line );
+    }
+
+    # To find the matching index
+    my $i;
+    my $key = -1;    # to allow for 0 to be a valid result
+    for ( $i = 0 ; $i < @priority ; $i++ ) {
+        if ( $borrowernumber == $priority[$i]->{'borrowernumber'} ) {
+            $key = $i;    # save the index
+            last;
+        }
+    }
+
+    # if index exists in array then move it to new position
+    if ( $key > -1 && $rank ne 'del' && $rank > 0 ) {
+        my $new_rank = $rank -
+          1;    # $new_rank is what you want the new index to be in the array
+        my $moving_item = splice( @priority, $key, 1 );
+        splice( @priority, $new_rank, 0, $moving_item );
+    }
+
+    # now fix the priority on those that are left....
+    $query = "
+            UPDATE reserves
+            SET    priority = ?
+                WHERE  biblionumber = ?
+                 AND borrowernumber   = ?
+                 AND reservedate = ?
+         AND found IS NULL
+    ";
+    $sth = $dbh->prepare($query);
+    for ( my $j = 0 ; $j < @priority ; $j++ ) {
+        $sth->execute(
+            $j + 1, $biblio,
+            $priority[$j]->{'borrowernumber'},
+            $priority[$j]->{'reservedate'}
+        );
+        $sth->finish;
+    }
+}
+
+#-------------------------------------------------------------------------------------
+
+=item ReserveWaiting
+
+branchcode = &ReserveWaiting($item,$borr);
+this function set FOUND to 'W' for Waiting into the database.
+
+=cut
+
+sub ReserveWaiting {
+    my ( $item, $borr,$diffBranchSend ) = @_;
+    my $dbh = C4::Context->dbh;
+
+    # get priority and biblionumber....
+    my $query = qq/
+        SELECT reserves.priority as priority,
+               reserves.biblionumber as biblionumber,
+               reserves.branchcode as branchcode,
+               reserves.timestamp as timestamp
+        FROM   reserves,items
+        WHERE  reserves.biblionumber = items.biblionumber
+          AND  items.itemnumber = ?
+          AND reserves.borrowernumber = ?
+          AND reserves.cancellationdate IS NULL
+          AND (reserves.found <> 'F' OR reserves.found IS NULL)
+    /;
+    my $sth = $dbh->prepare($query);
+    $sth->execute( $item, $borr );
+    my $data = $sth->fetchrow_hashref;
+    $sth->finish;
+    my $biblio    = $data->{'biblionumber'};
+    my $timestamp = $data->{'timestamp'};
+
+    # update reserves record....
+    if ($diffBranchSend) {
+    $query = "
+        UPDATE reserves
+        SET    priority = 0,
+               itemnumber = ?
+        WHERE borrowernumber = ?
+          AND biblionumber = ?
+          AND timestamp = ?
+    ";
+    }
+    else {
+    $query = "
+        UPDATE reserves
+        SET    priority = 0,
+               found = 'W',
+            waitingdate=now(),
+               itemnumber = ?
+        WHERE borrowernumber = ?
+          AND biblionumber = ?
+          AND timestamp = ?
+    ";
+    }
+    $sth = $dbh->prepare($query);
+    $sth->execute( $item, $borr, $biblio, $timestamp );
+    $sth->finish;
+
+    # now fix up the remaining priorities....
+    FixPriority( $data->{'priority'}, $biblio );
+    my $branchcode = $data->{'branchcode'};
+    return $branchcode;
+}
+
+#-------------------------------------------------------------------------------------
+
+=item GetWaitingReserves
+
address@hidden($borr);
+
+this funtion fetch the list of waiting reserves from database.
+
+=cut
+
+sub GetWaitingReserves {
+    my ($borr) = @_;
+    my $dbh = C4::Context->dbh;
+    my @itemswaiting;
+    my $query = "
+        SELECT *
+        FROM reserves
+        WHERE borrowernumber = ?
+          AND reserves.found = 'W'
+          AND cancellationdate IS NULL
+    ";
+    my $sth = $dbh->prepare($query);
+    $sth->execute($borr);
+    while ( my $data = $sth->fetchrow_hashref ) {
+        push( @itemswaiting, $data );
+    }
+    $sth->finish;
+    return address@hidden;
+}
+
+#-------------------------------------------------------------------------------------
+
+=item Findgroupreserve
+
+  @results = &Findgroupreserve($biblioitemnumber, $biblionumber);
+
+****** FIXME ******
+I don't know what this does, because I don't understand how reserve
+constraints work. I think the idea is that you reserve a particular
+biblio, and the constraint allows you to restrict it to a given
+biblioitem (e.g., if you want to borrow the audio book edition of "The
+Prophet", rather than the first available publication).
+
+C<&Findgroupreserve> returns :
+C<@results> is an array of references-to-hash whose keys are mostly
+fields from the reserves table of the Koha database, plus
+C<biblioitemnumber>.
+
+=cut
+
+#'
+sub Findgroupreserve {
+    my ( $bibitem, $biblio ) = @_;
+    my $dbh   = C4::Context->dbh;
+    my $query = qq/
+        SELECT reserves.biblionumber AS biblionumber,
+               reserves.borrowernumber AS borrowernumber,
+               reserves.reservedate AS reservedate,
+               reserves.branchcode AS branchcode,
+               reserves.cancellationdate AS cancellationdate,
+               reserves.found AS found,
+               reserves.reservenotes AS reservenotes,
+               reserves.priority AS priority,
+               reserves.timestamp AS timestamp,
+               reserveconstraints.biblioitemnumber AS biblioitemnumber,
+               reserves.itemnumber AS itemnumber
+        FROM reserves
+          LEFT JOIN reserveconstraints ON reserves.biblionumber = 
reserveconstraints.biblionumber
+        WHERE reserves.biblionumber = ?
+          AND ( ( reserveconstraints.biblioitemnumber = ?
+          AND reserves.borrowernumber = reserveconstraints.borrowernumber
+          AND reserves.reservedate    =reserveconstraints.reservedate )
+          OR  reserves.constrainttype='a' )
+          AND reserves.cancellationdate is NULL
+          AND (reserves.found <> 'F' or reserves.found is NULL)
+    /;
+    my $sth = $dbh->prepare($query);
+    $sth->execute( $biblio, $bibitem );
+    my @results;
+    while ( my $data = $sth->fetchrow_hashref ) {
+        push( @results, $data );
+    }
+    $sth->finish;
+    return @results;
+}
+
+=item CreateReserve
+
+CreateReserve($branch,$borrowernumber,$biblionumber,$constraint,$bibitems,$priority,$notes,$title,$checkitem,$found)
+
+FIXME - A somewhat different version of this function appears in
+C4::Reserves. Pick one and stick with it.
+
+=cut
+
+sub CreateReserve {
+    my (
+        $branch,    $borrowernumber, $biblionumber,
+        $constraint, $bibitems,  $priority,       $notes,
+        $title,      $checkitem, $found
+    ) = @_;
+    my $fee;
+    if ( $library_name =~ /Horowhenua/ ) {
+        $fee =
+          CalcHLTReserveFee($borrowernumber, $biblionumber, $constraint,
+            $bibitems );
+    }
+    else {
+        $fee =
+          CalcReserveFee($borrowernumber, $biblionumber, $constraint,
+            $bibitems );
+    }
+    my $dbh     = C4::Context->dbh;
+    my $const   = lc substr( $constraint, 0, 1 );
+    my @datearr = localtime(time);
+    my $resdate =
+      ( 1900 + $datearr[5] ) . "-" . ( $datearr[4] + 1 ) . "-" . $datearr[3];
+    my $waitingdate;
+
+    # If the reserv had the waiting status, we had the value of the resdate
+    if ( $found eq 'W' ) {
+        $waitingdate = $resdate;
+    }
+
+    #eval {
+    # updates take place here
+    if ( $fee > 0 ) {
+        my $nextacctno = &getnextacctno( $borrowernumber );
+        my $query      = qq/
+        INSERT INTO accountlines
+            
(borrowernumber,accountno,date,amount,description,accounttype,amountoutstanding)
+        VALUES
+            (?,?,now(),?,?,'Res',?)
+    /;
+        my $usth = $dbh->prepare($query);
+        $usth->execute( $borrowernumber, $nextacctno, $fee,
+            "Reserve Charge - $title", $fee );
+        $usth->finish;
+    }
+
+    #if ($const eq 'a'){
+    my $query = qq/
+        INSERT INTO reserves
+            (borrowernumber,biblionumber,reservedate,branchcode,constrainttype,
+            priority,reservenotes,itemnumber,found,waitingdate)
+        VALUES
+             (?,?,?,?,?,
+             ?,?,?,?,?)
+    /;
+    my $sth = $dbh->prepare($query);
+    $sth->execute(
+        $borrowernumber, $biblionumber, $resdate, $branch,
+        $const,          $priority,     $notes,   $checkitem,
+        $found,          $waitingdate
+    );
+    $sth->finish;
+
+    #}
+    if ( ( $const eq "o" ) || ( $const eq "e" ) ) {
+        my $numitems = @$bibitems;
+        my $i        = 0;
+        while ( $i < $numitems ) {
+            my $biblioitem = @$bibitems[$i];
+            my $query      = qq/
+          INSERT INTO reserveconstraints
+              (borrowernumber,biblionumber,reservedate,biblioitemnumber)
+          VALUES
+            (?,?,?,?)
+      /;
+            my $sth = $dbh->prepare("");
+            $sth->execute( $borrowernumber, $biblionumber, $resdate,
+                $biblioitem );
+            $sth->finish;
+            $i++;
+        }
+    }
+    return;
+}
+
+# FIXME - A functionally identical version of this function appears in
+# C4::Reserves. Pick one and stick with it.
+# XXX - Internal use only
+# FIXME - opac-reserves.pl need to use it, temporarily put into @EXPORT
+
+sub CalcReserveFee {
+    my ($borrowernumber, $biblionumber, $constraint, $bibitems ) = @_;
+
+    #check for issues;
+    my $dbh   = C4::Context->dbh;
+    my $const = lc substr( $constraint, 0, 1 );
+    my $query = qq/
+      SELECT * FROM borrowers,categories
+    WHERE borrowernumber = ?
+      AND borrowers.categorycode = categories.categorycode
+    /;
+    my $sth = $dbh->prepare($query);
+    $sth->execute($borrowernumber);
+    my $data = $sth->fetchrow_hashref;
+    $sth->finish();
+    my $fee      = $data->{'reservefee'};
+    my $cntitems = @- > $bibitems;
+
+    if ( $fee > 0 ) {
+
+        # check for items on issue
+        # first find biblioitem records
+        my @biblioitems;
+        my $sth1 = $dbh->prepare(
+            "SELECT * FROM biblio,biblioitems
+                   WHERE (biblio.biblionumber = ?)
+                     AND (biblio.biblionumber = biblioitems.biblionumber)"
+        );
+        $sth1->execute($biblionumber);
+        while ( my $data1 = $sth1->fetchrow_hashref ) {
+            if ( $const eq "a" ) {
+                push @biblioitems, $data1;
+            }
+            else {
+                my $found = 0;
+                my $x     = 0;
+                while ( $x < $cntitems ) {
+                    if ( @$bibitems->{'biblioitemnumber'} ==
+                        $data->{'biblioitemnumber'} )
+                    {
+                        $found = 1;
+                    }
+                    $x++;
+                }
+                if ( $const eq 'o' ) {
+                    if ( $found == 1 ) {
+                        push @biblioitems, $data1;
+                    }
+                }
+                else {
+                    if ( $found == 0 ) {
+                        push @biblioitems, $data1;
+                    }
+                }
+            }
+        }
+        $sth1->finish;
+        my $cntitemsfound = @biblioitems;
+        my $issues        = 0;
+        my $x             = 0;
+        my $allissued     = 1;
+        while ( $x < $cntitemsfound ) {
+            my $bitdata = $biblioitems[$x];
+            my $sth2    = $dbh->prepare(
+                "SELECT * FROM items
+                     WHERE biblioitemnumber = ?"
+            );
+            $sth2->execute( $bitdata->{'biblioitemnumber'} );
+            while ( my $itdata = $sth2->fetchrow_hashref ) {
+                my $sth3 = $dbh->prepare(
+                    "SELECT * FROM issues
+                       WHERE itemnumber = ?
+                         AND returndate IS NULL"
+                );
+                $sth3->execute( $itdata->{'itemnumber'} );
+                if ( my $isdata = $sth3->fetchrow_hashref ) {
+                }
+                else {
+                    $allissued = 0;
+                }
+            }
+            $x++;
+        }
+        if ( $allissued == 0 ) {
+            my $rsth =
+              $dbh->prepare("SELECT * FROM reserves WHERE biblionumber = ?");
+            $rsth->execute($biblionumber);
+            if ( my $rdata = $rsth->fetchrow_hashref ) {
+            }
+            else {
+                $fee = 0;
+            }
+        }
+    }
+
+    #  print "fee $fee";
+    return $fee;
+}
+
+# The following are junior and young adult item types that should not incur a
+# reserve charge.
+#
+# Juniors: BJC, BJCN, BJF, BJK, BJM, BJN, BJP, BJSF, BJSN, DJ, DJP, FJ, JVID,
+#  VJ, VJP, PJ, TJ, TJP, VJ, VJP.
+#
+# Young adults: BYF, BYN, BYP, DY, DYP, PY, PYP, TY, TYP, VY, VYP.
+#
+# All other item types should incur a reserve charge.
+sub CalcHLTReserveFee {
+    my ($borrowernumber, $biblionumber, $constraint, $bibitems ) = @_;
+    my $dbh = C4::Context->dbh;
+    my $sth = $dbh->prepare(
+        "SELECT * FROM borrowers,categories
+                  WHERE (borrowernumber = ?)
+                    AND (borrowers.categorycode = categories.categorycode)"
+    );
+    $sth->execute($borrowernumber);
+    my $data = $sth->fetchrow_hashref;
+    $sth->finish();
+    my $fee = $data->{'reservefee'};
+
+    my $matchno;
+    my @nocharge =
+      qw/BJC BJCN BJF BJK BJM BJN BJP BJSF BJSN DJ DJP FJ NJ CJ VJ VJP PJ TJ 
TJP BYF BYN BYP DY DYP PY PYP TY TYP VY VYP/;
+    $sth = $dbh->prepare(
+        "SELECT * FROM biblio,biblioitems
+                     WHERE (biblio.biblionumber = ?)
+                       AND (biblio.biblionumber = biblioitems.biblionumber)"
+    );
+    $sth->execute($biblionumber);
+    $data = $sth->fetchrow_hashref;
+    my $itemtype = $data->{'itemtype'};
+    for ( my $i = 0 ; $i < @nocharge ; $i++ ) {
+        if ( $itemtype eq $nocharge[$i] ) {
+            $matchno++;
+            last;
+        }
+    }
+
+    if ( $matchno > 0 ) {
+        $fee = 0;
+    }
+    return $fee;
+}
+
+=item GetNextAccountNumber
+
+GetNextAccountNumber()
+
+=cut
+
+sub GetNextAccountNumber {
+    my ($borrowernumber, $dbh ) = @_;
+    my $nextaccntno = 1;
+    my $sth         = $dbh->prepare(
+        "select * from accountlines
+  where (borrowernumber = ?)
+  order by accountno desc"
+    );
+    $sth->execute($borrowernumber);
+    if ( my $accdata = $sth->fetchrow_hashref ) {
+        $nextaccntno = $accdata->{'accountno'} + 1;
+    }
+    $sth->finish;
+    return ($nextaccntno);
+}
+
+#-------------------------------------------------------------------------------------
+
+=item UpdateReserve
+
+&UpdateReserve($rank,$biblio,$borrower,$branch)
+
+=cut
+
+sub UpdateReserve {
+    #subroutine to update a reserve
+    my ( $rank, $biblio, $borrower, $branch , $itemnumber) = @_;
+     return if $rank eq "W";
+     return if $rank eq "n";
+    my $dbh = C4::Context->dbh;
+    if ( $rank eq "del" ) {
+        my $query = qq/
+            UPDATE reserves
+            SET    cancellationdate=now()
+            WHERE  biblionumber   = ?
+             AND   borrowernumber = ?
+             AND   cancellationdate is NULL
+             AND   (found <> 'F' or found is NULL)
+        /;
+        my $sth = $dbh->prepare($query);
+        $sth->execute( $biblio, $borrower );
+        $sth->finish;
+        
+    }
+    else {
+        my $query = qq/
+        UPDATE reserves SET priority = ? ,branchcode = ?, itemnumber = ?, 
found = NULL
+            WHERE biblionumber   = ?
+             AND borrowernumber = ?
+             AND cancellationdate is NULL
+             AND (found <> 'F' or found is NULL)
+        /;
+        my $sth = $dbh->prepare($query);
+        $sth->execute( $rank, $branch,$itemnumber, $biblio, $borrower);
+        $sth->finish;
+        FixPriority( $biblio, $borrower, $rank);
+    }
+}
+
+=item GetReserveTitle
+
+$data = GetReserveTitle($biblio,$bor,$date,$timestamp);
+
+=cut
+
+sub GetReserveTitle {
+    my ( $biblio, $bor, $date, $timestamp ) = @_;
+    my $dbh   = C4::Context->dbh;
+    my $query = qq/
+        SELECT *
+        FROM   reserveconstraints,biblioitems
+        WHERE  reserveconstraints.biblioitemnumber=biblioitems.biblioitemnumber
+          AND   reserveconstraints.biblionumber=?
+         AND   reserveconstraints.borrowernumber = ?
+         AND   reserveconstraints.reservedate=?
+         AND   reserveconstraints.timestamp=?
+    /;
+    my $sth = $dbh->prepare($query);
+    $sth->execute( $biblio, $bor, $date, $timestamp );
+    my $data = $sth->fetchrow_hashref;
+    $sth->finish;
+    return $data;
+}
+
+=item FindReservesInQueue
+
+  $results = &FindReservesInQueue($biblionumber);
+
+Simple variant of FindReserves, exept the result is now displaying only the 
queue list of reservations with the same biblionumber (At this time only 
displayed in request.pl)
+
+C<&FindReservesInQueue> returns a two-element array:
+
+C<$results> is a reference to an array of references of hashes. Each hash
+has for keys a list of column from reserves table (see details in function).
+
+=cut
+
+#'
+
+sub FindReservesInQueue {
+    my ($biblionumber) = @_;
+    my $dbh = C4::Context->dbh;
+
+    # Find the desired items in the reserves
+    my $query = qq/
+        SELECT  branchcode,
+                timestamp AS rtimestamp,
+                priority,
+                biblionumber,
+                borrowernumber,
+                reservedate,
+                constrainttype,
+                found,
+                itemnumber
+          FROM     reserves
+          WHERE     cancellationdate IS NULL
+        AND biblionumber = ?
+          AND    (found <> \'F\' OR found IS NULL)
+          AND priority <> \'0\'
+          ORDER BY priority
+    /;
+    my $sth = $dbh->prepare($query);
+    $sth->execute($biblionumber);
+    my @results;
+    my $i = 0;
+    while ( my $data = $sth->fetchrow_hashref ) {
+
+        # FIXME - What is this if-statement doing? How do constraints work?
+        if ( $data->{constrainttype} eq 'o' ) {
+            $query = '
+                SELECT biblioitemnumber
+                FROM reserveconstraints
+                WHERE biblionumber   = ?
+                    AND borrowernumber = ?
+                  AND reservedate    = ?
+            ';
+            my $csth = $dbh->prepare($query);
+            $csth->execute( $data->{biblionumber}, $data->{borrowernumber},
+                $data->{reservedate}, );
+
+            my @bibitemno;
+            while ( my $bibitemnos = $csth->fetchrow_array ) {
+                push( @bibitemno, $bibitemnos );
+            }
+            my $count = @bibitemno;
+
+            # if we have two or more different specific itemtypes
+            # reserved by same person on same day
+            my $bdata;
+            if ( $count > 1 ) {
+                $bdata = GetBiblioItemData( $bibitemno[$i] );
+                $i++;
+            }
+            else {
+                # Look up the book we just found.
+                $bdata = GetBiblioItemData( $bibitemno[0] );
+            }
+            $csth->finish;
+
+            # Add the results of this latest search to the current
+            # results.
+            # FIXME - An 'each' would probably be more efficient.
+            foreach my $key ( keys %$bdata ) {
+                $data->{$key} = $bdata->{$key};
+            }
+        }
+        push @results, $data;
+    }
+    $sth->finish;
+
+    return ( $#results + 1, address@hidden );
+}
+
+
+=head2 GetReservesToBranch
+
address@hidden = GetReservesToBranch( $frombranch );
+
+Get reserve list for a given branch
+
+=cut
+
+sub GetReservesToBranch {
+    my ( $frombranch ) = @_;
+    my $dbh = C4::Context->dbh;
+    my $sth = $dbh->prepare(
+        "SELECT borrowernumber,reservedate,itemnumber,timestamp
+         FROM reserves 
+         WHERE priority='0' AND cancellationdate is null  
+           AND branchcode=?
+           AND found IS NULL "
+    );
+    $sth->execute( $frombranch );
+    my @transreserv;
+    my $i = 0;
+    while ( my $data = $sth->fetchrow_hashref ) {
+        $transreserv[$i] = $data;
+        $i++;
+    }
+    $sth->finish;
+    return (@transreserv);
+}
+
+=head2 GetReservesForBranch
+
address@hidden = GetReservesForBranch($frombranch);
+
+=cut
+
+sub GetReservesForBranch {
+    my ($frombranch) = @_;
+    my $dbh          = C4::Context->dbh;
+    my $sth          = $dbh->prepare( "
+        SELECT borrowernumber,reservedate,itemnumber,waitingdate
+        FROM   reserves 
+        WHERE   priority='0'
+            AND cancellationdate IS NULL 
+            AND found='W' 
+            AND branchcode=?
+        ORDER BY waitingdate" );
+    $sth->execute($frombranch);
+    my @transreserv;
+    my $i = 0;
+    while ( my $data = $sth->fetchrow_hashref ) {
+        $transreserv[$i] = $data;
+        $i++;
+    }
+    $sth->finish;
+    return (@transreserv);
+}
+
+=back
+
+=head1 AUTHOR
+
+Koha Developement team <address@hidden>
+
+=cut
+

Index: C4/Reserves2.pm
===================================================================
RCS file: C4/Reserves2.pm
diff -N C4/Reserves2.pm
--- C4/Reserves2.pm     18 Apr 2007 17:00:14 -0000      1.54
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,1452 +0,0 @@
-# -*- tab-width: 8 -*-
-# NOTE: This file uses standard 8-character tabs
-
-package C4::Reserves2;
-
-# Copyright 2000-2002 Katipo Communications
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# 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.54 2007/04/18 17:00:14 tipaul Exp $
-
-use strict;
-require Exporter;
-use C4::Context;
-use C4::Biblio;
-use C4::Search;
-use C4::Circulation;
-
-use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
-my $library_name = C4::Context->preference("LibraryName");
-
-# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.54 $' =~ /\d+/g; shift(@v) . "." . join( 
"_", map { sprintf "%03d", $_ } @v ); };
-
-=head1 NAME
-
-C4::Reserves2 - Koha functions for dealing with reservation.
-
-=head1 SYNOPSIS
-
-  use C4::Reserves2;
-
-=head1 DESCRIPTION
-
-this modules provides somes functions to deal with reservations.
-
-=head1 FUNCTIONS
-
-=over 2
-
-=cut
-
address@hidden = qw(Exporter);
-
address@hidden = qw(
-  &FindReserves
-  &CheckReserves
-  &GetWaitingReserves
-  &CancelReserve
-  &CalcReserveFee
-  &FillReserve
-  &ReserveWaiting
-  &CreateReserve
-  &UpdateReserve
-  &GetReserveTitle
-  &GetReservations
-  &SetWaitingStatus
-  &GlobalCancel
-  &MinusPriority
-  &OtherReserves
-  &GetFirstReserveDateFromItem
-  &CountReservesFromBorrower
-  &FixPriority
-  &FindReservesInQueue
-  GetReservesForBranch
-  GetReservesToBranch
-);
-
-# make all your functions, whether exported or not;
-
-=item GlobalCancel
-
-($messages,$nextreservinfo) = &GlobalCancel($itemnumber,$borrowernumber);
-
-    New op dev for the circulation based on item, global is a function to 
cancel reserv,check other reserves, and transfer document if it's necessary
-
-=cut
-
-sub GlobalCancel {
-    my $messages;
-    my $nextreservinfo;
-    my ( $itemnumber, $borrowernumber ) = @_;
-
-    #step 1 : cancel the reservation
-    my $CancelReserve = CancelReserve( undef, $itemnumber, $borrowernumber );
-
-    #step 2 launch the subroutine of the others reserves
-    ( $messages, $nextreservinfo ) = OtherReserves($itemnumber);
-
-    return ( $messages, $nextreservinfo );
-}
-
-=item OtherReserves
-
-($messages,$nextreservinfo)=$OtherReserves(itemnumber);
-
-Check queued list of this document and check if this document must be  
transfered
-
-=cut
-
-#'
-sub OtherReserves {
-    my ($itemnumber) = @_;
-    my $messages;
-    my $nextreservinfo;
-    my ( $restype, $checkreserves ) = CheckReserves($itemnumber);
-    if ($checkreserves) {
-        my $iteminfo = GetItem($itemnumber);
-        if ( $iteminfo->{'holdingbranch'} ne $checkreserves->{'branchcode'} ) {
-            $messages->{'transfert'} = $checkreserves->{'branchcode'};
-            #minus priorities of others reservs
-            MinusPriority(
-                $itemnumber,
-                $checkreserves->{'borrowernumber'},
-                $iteminfo->{'biblionumber'}
-            );
-
-            #launch the subroutine dotransfer
-            C4::Circulation::dotransfer(
-                $itemnumber,
-                $iteminfo->{'holdingbranch'},
-                $checkreserves->{'branchcode'}
-              ),
-              ;
-        }
-
-     #step 2b : case of a reservation on the same branch, set the waiting 
status
-        else {
-            $messages->{'waiting'} = 1;
-            MinusPriority(
-                $itemnumber,
-                $checkreserves->{'borrowernumber'},
-                $iteminfo->{'biblionumber'}
-            );
-            SetWaitingStatus($itemnumber);
-        }
-
-        $nextreservinfo = $checkreserves->{'borrowernumber'};
-    }
-
-    return ( $messages, $nextreservinfo );
-}
-
-=item MinusPriority
-
-&MinusPriority($itemnumber,$borrowernumber,$biblionumber)
-
-Reduce the values of queuded list     
-
-=cut
-
-#'
-sub MinusPriority {
-    my ( $itemnumber, $borrowernumber, $biblionumber ) = @_;
-
-    #first step update the value of the first person on reserv
-    my $dbh   = C4::Context->dbh;
-    my $query = "
-        UPDATE reserves
-        SET    priority = 0 , itemnumber = ? 
-        WHERE  cancellationdate IS NULL 
-          AND  borrowernumber=?
-          AND  biblionumber=?
-    ";
-    my $sth_upd = $dbh->prepare($query);
-    $sth_upd->execute( $itemnumber, $borrowernumber, $biblionumber );
-    $sth_upd->finish;
-    # second step update all others reservs
-    $query = "
-        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($biblionumber);
-    while ( my ( $priority, $borrowernumber, $biblionumber, $reservedate ) =
-        $sth_oth->fetchrow_array )
-    {
-        $priority--;
-        $query = "
-             UPDATE reserves
-             SET    priority = ?
-             WHERE  biblionumber = ?
-               AND  borrowernumber   = ?
-               AND  reservedate      = ?
-        ";
-        my $sth_upd_oth = $dbh->prepare($query);
-        $sth_upd_oth->execute( $priority, $biblionumber, $borrowernumber,
-            $reservedate );
-        $sth_upd_oth->finish;
-    }
-    $sth_oth->finish;
-}
-
-=item SetWaitingStatus
-
-&SetWaitingStatus($itemnumber);
-
-we check if we have a reserves with itemnumber (New op system of reserves), if 
we found one, we update the status of the reservation when we have : 'priority' 
= 0, and we have an itemnumber 
-
-=cut
-
-sub SetWaitingStatus {
-
-    #first : check if we have a reservation for this item .
-    my ($itemnumber) = @_;
-    my $dbh          = C4::Context->dbh;
-    my $query        = "
-        SELECT priority,borrowernumber
-        FROM   reserves
-        WHERE  itemnumber=?
-           AND cancellationdate IS NULL
-           AND found IS NULL AND priority='0'
-    ";
-    my $sth_find = $dbh->prepare($query);
-    $sth_find->execute($itemnumber);
-    my ( $priority, $borrowernumber ) = $sth_find->fetchrow_array;
-    $sth_find->finish;
-    return unless $borrowernumber;
-
-# step 2 : if we have a borrowernumber, we update the value found to 'W' to 
notify the borrower
-    $query = "
-    UPDATE reserves
-    SET    found='W',waitingdate = now()
-    WHERE  borrowernumber=?
-      AND itemnumber=?
-      AND found IS NULL
-    ";
-    my $sth_set = $dbh->prepare($query);
-    $sth_set->execute( $borrowernumber, $itemnumber );
-    $sth_set->finish;
-}
-
-=item GetReservations
-
address@hidden&GetReservations($itemnumber,$borrowernumber);
-
-this function get the list of reservation for an C<$itemnumber> or 
C<$borrowernumber>
-given on input arg. You should give $itemnumber OR $borrowernumber but not 
both.
-
-=cut
-
-sub GetReservations {
-    my ( $itemnumber, $borrowernumber ) = @_;
-    if ($itemnumber) {
-        my $dbh   = C4::Context->dbh;
-        my $query = "
-            SELECT reservedate,borrowernumber
-            FROM   reserves
-            WHERE  itemnumber=?
-              AND  cancellationdate IS NULL
-              AND  (found <> 'F' OR found IS NULL)
-        ";
-        my $sth_res = $dbh->prepare($query);
-        $sth_res->execute($itemnumber);
-        my ( $reservedate, $borrowernumber ) = $sth_res->fetchrow_array;
-        return ( $reservedate, $borrowernumber );
-    }
-    if ($borrowernumber) {
-        my $dbh   = C4::Context->dbh;
-        my $query = "
-            SELECT *
-            FROM   reserves
-            WHERE  borrowernumber=?
-              AND  cancellationdate IS NULL
-              AND (found != 'F' or found is null)
-            ORDER BY reservedate
-        ";
-
-        my $sth_find = $dbh->prepare($query);
-        $sth_find->execute($borrowernumber);
-        my @borrowerreserv;
-        while ( my $data = $sth_find->fetchrow_hashref ) {
-            push @borrowerreserv, $data;
-        }
-        return @borrowerreserv;
-    }
-}
-
-=item FindReserves
-
-  $results = &FindReserves($biblionumber, $borrowernumber);
-
-Looks books up in the reserves. C<$biblionumber> is the biblionumber
-of the book to look up. C<$borrowernumber> is the borrower number of a
-patron whose books to look up.
-
-Either C<$biblionumber> or C<$borrowernumber> may be the empty string,
-but not both. If both are specified, C<&FindReserves> looks up the
-given book for the given patron. If only C<$biblionumber> is
-specified, C<&FindReserves> looks up that book for all patrons. If
-only C<$borrowernumber> is specified, C<&FindReserves> looks up all of
-that patron's reserves. If neither is specified, C<&FindReserves>
-barfs.
-
-For each book thus found, C<&FindReserves> checks the reserve
-constraints and does something I don't understand.
-
-C<&FindReserves> returns a two-element array:
-
-C<$results> is a reference to an array of references of hashes. Each hash
-has for keys a list of column from reserves table (see details in function).
-
-=cut
-
-#'
-sub FindReserves {
-    my ( $biblionumber, $bor ) = @_;
-    my $dbh = C4::Context->dbh;
-    my @bind;
-
-    # Find the desired items in the reserves
-    my $query = "
-        SELECT  branchcode,
-                timestamp AS rtimestamp,
-                priority,
-                biblionumber,
-                borrowernumber,
-                reservedate,
-                constrainttype,
-                found,
-                itemnumber
-          FROM     reserves
-          WHERE     cancellationdate IS NULL
-          AND    (found <> \'F\' OR found IS NULL)
-    ";
-
-    if ( $biblionumber ne '' ) {
-        $query .= '
-            AND biblionumber = ?
-        ';
-        push @bind, $biblionumber;
-    }
-
-    if ( $bor ne '' ) {
-        $query .= '
-            AND borrowernumber = ?
-        ';
-        push @bind, $bor;
-    }
-
-    $query .= '
-          ORDER BY priority
-    ';
-    my $sth = $dbh->prepare($query);
-    $sth->execute(@bind);
-    my @results;
-    my $i = 0;
-    while ( my $data = $sth->fetchrow_hashref ) {
-
-        # FIXME - What is this if-statement doing? How do constraints work?
-        if ( $data->{constrainttype} eq 'o' ) {
-            $query = '
-                SELECT biblioitemnumber
-                FROM reserveconstraints
-                WHERE biblionumber   = ?
-                    AND borrowernumber = ?
-                  AND reservedate    = ?
-            ';
-            my $csth = $dbh->prepare($query);
-            $csth->execute( $data->{biblionumber}, $data->{borrowernumber},
-                $data->{reservedate}, );
-
-            my @bibitemno;
-            while ( my $bibitemnos = $csth->fetchrow_array ) {
-                push( @bibitemno, $bibitemnos );
-            }
-            my $count = @bibitemno;
-
-            # if we have two or more different specific itemtypes
-            # reserved by same person on same day
-            my $bdata;
-            if ( $count > 1 ) {
-                $bdata = GetBiblioItemData( $bibitemno[$i] );
-                $i++;
-            }
-            else {
-
-                # Look up the book we just found.
-                $bdata = GetBiblioItemData( $bibitemno[0] );
-            }
-            $csth->finish;
-
-            # Add the results of this latest search to the current
-            # results.
-            # FIXME - An 'each' would probably be more efficient.
-            foreach my $key ( keys %$bdata ) {
-                $data->{$key} = $bdata->{$key};
-            }
-        }
-        push @results, $data;
-    }
-    $sth->finish;
-
-    return ( $#results + 1, address@hidden );
-}
-
-#-------------------------------------------------------------------------------------
-
-=item CountReservesFromBorrower
-
-$number = &CountReservesFromBorrower($borrowernumber);
-
-this function returns the number of reservation for a borrower given on input 
arg.
-
-=cut
-
-sub CountReservesFromBorrower {
-    my ($borrowernumber) = @_;
-
-    my $dbh = C4::Context->dbh;
-
-    my $query = '
-        SELECT COUNT(*) AS counter
-        FROM reserves
-          WHERE borrowernumber = ?
-          AND cancellationdate IS NULL
-          AND (found != \'F\' OR found IS NULL)
-    ';
-    my $sth = $dbh->prepare($query);
-    $sth->execute($borrowernumber);
-    my $row = $sth->fetchrow_hashref;
-    $sth->finish;
-
-    return $row->{counter};
-}
-
-#-------------------------------------------------------------------------------------
-
-=item GetFirstReserveDateFromItem
-
-$date = GetFirstReserveDateFromItem($itemnumber)
-
-this function returns the first date a item has been reserved.
-
-=cut
-
-sub GetFirstReserveDateFromItem {
-    my ($itemnumber) = @_;
-
-    my $dbh = C4::Context->dbh;
-
-    my $query = '
-        SELECT reservedate,
-        borrowernumber,
-        branchcode
-        FROM   reserves
-        WHERE  itemnumber = ?
-          AND  cancellationdate IS NULL
-          AND (found != \'F\' OR found IS NULL)
-    ';
-    my $sth = $dbh->prepare($query);
-    $sth->execute($itemnumber);
-    my $row = $sth->fetchrow_hashref;
-
-    return ($row->{reservedate},$row->{borrowernumber},$row->{branchcode});
-}
-
-#-------------------------------------------------------------------------------------
-
-=item CheckReserves
-
-  ($status, $reserve) = &CheckReserves($itemnumber, $barcode);
-
-Find a book in the reserves.
-
-C<$itemnumber> is the book's item number. C<$barcode> is its barcode.
-Either one, but not both, may be false. If both are specified,
-C<&CheckReserves> uses C<$itemnumber>.
-
-$itemnubmer can be false, in which case uses the barcode. (Never uses
-both. $itemnumber gets priority).
-
-As I understand it, C<&CheckReserves> looks for the given item in the
-reserves. If it is found, that's a match, and C<$status> is set to
-C<Waiting>.
-
-Otherwise, it finds the most important item in the reserves with the
-same biblio number as this book (I'm not clear on this) and returns it
-with C<$status> set to C<Reserved>.
-
-C<&CheckReserves> returns a two-element list:
-
-C<$status> is either C<Waiting>, C<Reserved> (see above), or 0.
-
-C<$reserve> is the reserve item that matched. It is a
-reference-to-hash whose keys are mostly the fields of the reserves
-table in the Koha database.
-
-=cut
-
-#'
-sub CheckReserves {
-    my ( $item, $barcode ) = @_;
-    my $dbh = C4::Context->dbh;
-    my $sth;
-    if ($item) {
-        my $qitem = $dbh->quote($item);
-        # Look up the item by itemnumber
-        my $query = "
-            SELECT items.biblionumber, items.biblioitemnumber, 
itemtypes.notforloan
-            FROM   items, biblioitems, itemtypes
-            WHERE  items.biblioitemnumber = biblioitems.biblioitemnumber
-               AND biblioitems.itemtype = itemtypes.itemtype
-               AND itemnumber=$qitem
-        ";
-        $sth = $dbh->prepare($query);
-    }
-    else {
-        my $qbc = $dbh->quote($barcode);
-        # Look up the item by barcode
-        my $query = "
-            SELECT items.biblionumber, items.biblioitemnumber, 
itemtypes.notforloan
-            FROM   items, biblioitems, itemtypes
-            WHERE  items.biblioitemnumber = biblioitems.biblioitemnumber
-              AND biblioitems.itemtype = itemtypes.itemtype
-              AND barcode=$qbc
-        ";
-        $sth = $dbh->prepare($query);
-
-        # FIXME - This function uses $item later on. Ought to set it here.
-    }
-    $sth->execute;
-    my ( $biblio, $bibitem, $notforloan ) = $sth->fetchrow_array;
-    $sth->finish;
-
-    # if item is not for loan it cannot be reserved either.....
-    return ( 0, 0 ) if $notforloan;
-
-    # get the reserves...
-    # Find this item in the reserves
-    my @reserves = Findgroupreserve( $bibitem, $biblio );
-    my $count    = scalar @reserves;
-
-    # $priority and $highest are used to find the most important item
-    # in the list returned by &Findgroupreserve. (The lower $priority,
-    # the more important the item.)
-    # $highest is the most important item we've seen so far.
-    my $priority = 10000000;
-    my $highest;
-    if ($count) {
-        foreach my $res (@reserves) {
-            # FIXME - $item might be undefined or empty: the caller
-            # might be searching by barcode.
-            if ( $res->{'itemnumber'} == $item ) {
-                # Found it
-                return ( "Waiting", $res );
-            }
-            else {
-                # See if this item is more important than what we've got
-                # so far.
-                if ( $res->{'priority'} != 0 && $res->{'priority'} < $priority 
)
-                {
-                    $priority = $res->{'priority'};
-                    $highest  = $res;
-                }
-            }
-        }
-    }
-
-    # If we get this far, then no exact match was found. Print the
-    # most important item on the list. I think this tells us who's
-    # next in line to get this book.
-    if ($highest) {    # FIXME - $highest might be undefined
-        $highest->{'itemnumber'} = $item;
-        return ( "Reserved", $highest );
-    }
-    else {
-        return ( 0, 0 );
-    }
-}
-
-#-------------------------------------------------------------------------------------
-
-=item CancelReserve
-
-  &CancelReserve($biblionumber, $itemnumber, $borrowernumber);
-
-Cancels a reserve.
-
-Use either C<$biblionumber> or C<$itemnumber> to specify the item to
-cancel, but not both: if both are given, C<&CancelReserve> does
-nothing.
-
-C<$borrowernumber> is the borrower number of the patron on whose
-behalf the book was reserved.
-
-If C<$biblionumber> was given, C<&CancelReserve> also adjusts the
-priorities of the other people who are waiting on the book.
-
-=cut
-
-#'
-sub CancelReserve {
-    my ( $biblio, $item, $borr ) = @_;
-    my $dbh = C4::Context->dbh;
-        if ( ( $item and $borr ) and ( not $biblio ) ) {
-        # removing a waiting reserve record....
-        # update the database...
-        my $query = "
-            UPDATE reserves
-            SET    cancellationdate = now(),
-                   found            = Null,
-                   priority         = 0
-            WHERE  itemnumber       = ?
-             AND   borrowernumber   = ?
-        ";
-        my $sth = $dbh->prepare($query);
-        $sth->execute( $item, $borr );
-        $sth->finish;
-    }
-    if ( ( $biblio and $borr ) and ( not $item ) ) {
-        # removing a reserve record....
-        # get the prioritiy on this record....
-        my $priority;
-        my $query = qq/
-            SELECT priority FROM reserves
-            WHERE biblionumber   = ?
-              AND borrowernumber = ?
-              AND cancellationdate IS NULL
-              AND itemnumber IS NULL
-              AND (found <> 'F' OR found IS NULL)
-        /;
-        my $sth = $dbh->prepare($query);
-        $sth->execute( $biblio, $borr );
-        ($priority) = $sth->fetchrow_array;
-        $sth->finish;
-        $query = qq/
-            UPDATE reserves
-            SET    cancellationdate = now(),
-                   found            = Null,
-                   priority         = 0
-            WHERE  biblionumber     = ?
-              AND  borrowernumber   = ?
-              AND cancellationdate IS NULL
-              AND (found <> 'F' or found IS NULL)
-        /;
-
-        # update the database, removing the record...
-        $sth = $dbh->prepare($query);
-        $sth->execute( $biblio, $borr );
-        $sth->finish;
-
-        # now fix the priority on the others....
-        FixPriority( $priority, $biblio );
-    }
-}
-
-#-------------------------------------------------------------------------------------
-
-=item FillReserve
-
-  &FillReserve($reserve);
-
-Fill a reserve. If I understand this correctly, this means that the
-reserved book has been found and given to the patron who reserved it.
-
-C<$reserve> specifies the reserve to fill. It is a reference-to-hash
-whose keys are fields from the reserves table in the Koha database.
-
-=cut
-
-#'
-sub FillReserve {
-    my ($res) = @_;
-    my $dbh = C4::Context->dbh;
-    # fill in a reserve record....
-    my $qbiblio = $res->{'biblionumber'};
-    my $borr    = $res->{'borrowernumber'};
-    my $resdate = $res->{'reservedate'};
-
-    # get the priority on this record....
-    my $priority;
-    my $query = "SELECT priority
-                 FROM   reserves
-                 WHERE  biblionumber   = ?
-                  AND   borrowernumber = ?
-                  AND   reservedate    = ?";
-    my $sth = $dbh->prepare($query);
-    $sth->execute( $qbiblio, $borr, $resdate );
-    ($priority) = $sth->fetchrow_array;
-    $sth->finish;
-
-    # update the database...
-    $query = "UPDATE reserves
-                  SET    found            = 'F',
-                         priority         = 0
-                 WHERE  biblionumber     = ?
-                    AND reservedate      = ?
-                    AND borrowernumber   = ?
-                ";
-    $sth = $dbh->prepare($query);
-    $sth->execute( $qbiblio, $resdate, $borr );
-    $sth->finish;
-
-    # now fix the priority on the others (if the priority wasn't
-    # already sorted!)....
-    unless ( $priority == 0 ) {
-        FixPriority( $priority, $qbiblio );
-    }
-}
-
-#-------------------------------------------------------------------------------------
-
-=item FixPriority
-
-&FixPriority($biblio,$borrowernumber,$rank);
-
- Only used internally (so don't export it)
- Changed how this functions works #
- Now just gets an array of reserves in the rank order and updates them with
- the array index (+1 as array starts from 0)
- and if $rank is supplied will splice item from the array and splice it back 
in again
- in new priority rank
-
-=cut 
-
-sub FixPriority {
-    my ( $biblio, $borrowernumber, $rank ) = @_;
-    my $dbh = C4::Context->dbh;
-     if ( $rank eq "del" ) {
-         CancelReserve( $biblio, undef, $borrowernumber );
-     }
-    if ( $rank eq "W" || $rank eq "0" ) {
-
-        # make sure priority for waiting items is 0
-        my $query = qq/
-            UPDATE reserves
-            SET    priority = 0
-            WHERE biblionumber = ?
-              AND borrowernumber = ?
-              AND cancellationdate IS NULL
-              AND found ='W'
-        /;
-        my $sth = $dbh->prepare($query);
-        $sth->execute( $biblio, $borrowernumber );
-    }
-    my @priority;
-    my @reservedates;
-
-    # get whats left
-# FIXME adding a new security in returned elements for changing priority,
-# now, we don't care anymore any reservations with itemnumber linked (suppose 
a waiting reserve)
-    my $query = qq/
-        SELECT borrowernumber, reservedate, constrainttype
-        FROM   reserves
-        WHERE  biblionumber   = ?
-          AND  cancellationdate IS NULL
-          AND  itemnumber IS NULL
-          AND  ((found <> 'F' and found <> 'W') or found is NULL)
-        ORDER BY priority ASC
-    /;
-    my $sth = $dbh->prepare($query);
-    $sth->execute($biblio);
-    while ( my $line = $sth->fetchrow_hashref ) {
-        push( @reservedates, $line );
-        push( @priority,     $line );
-    }
-
-    # To find the matching index
-    my $i;
-    my $key = -1;    # to allow for 0 to be a valid result
-    for ( $i = 0 ; $i < @priority ; $i++ ) {
-        if ( $borrowernumber == $priority[$i]->{'borrowernumber'} ) {
-            $key = $i;    # save the index
-            last;
-        }
-    }
-
-    # if index exists in array then move it to new position
-    if ( $key > -1 && $rank ne 'del' && $rank > 0 ) {
-        my $new_rank = $rank -
-          1;    # $new_rank is what you want the new index to be in the array
-        my $moving_item = splice( @priority, $key, 1 );
-        splice( @priority, $new_rank, 0, $moving_item );
-    }
-
-    # now fix the priority on those that are left....
-    $query = "
-            UPDATE reserves
-            SET    priority = ?
-                WHERE  biblionumber = ?
-                 AND borrowernumber   = ?
-                 AND reservedate = ?
-         AND found IS NULL
-    ";
-    $sth = $dbh->prepare($query);
-    for ( my $j = 0 ; $j < @priority ; $j++ ) {
-        $sth->execute(
-            $j + 1, $biblio,
-            $priority[$j]->{'borrowernumber'},
-            $priority[$j]->{'reservedate'}
-        );
-        $sth->finish;
-    }
-}
-
-#-------------------------------------------------------------------------------------
-
-=item ReserveWaiting
-
-branchcode = &ReserveWaiting($item,$borr);
-this function set FOUND to 'W' for Waiting into the database.
-
-=cut
-
-sub ReserveWaiting {
-    my ( $item, $borr,$diffBranchSend ) = @_;
-    my $dbh = C4::Context->dbh;
-
-    # get priority and biblionumber....
-    my $query = qq/
-        SELECT reserves.priority as priority,
-               reserves.biblionumber as biblionumber,
-               reserves.branchcode as branchcode,
-               reserves.timestamp as timestamp
-        FROM   reserves,items
-        WHERE  reserves.biblionumber = items.biblionumber
-          AND  items.itemnumber = ?
-          AND reserves.borrowernumber = ?
-          AND reserves.cancellationdate IS NULL
-          AND (reserves.found <> 'F' OR reserves.found IS NULL)
-    /;
-    my $sth = $dbh->prepare($query);
-    $sth->execute( $item, $borr );
-    my $data = $sth->fetchrow_hashref;
-    $sth->finish;
-    my $biblio    = $data->{'biblionumber'};
-    my $timestamp = $data->{'timestamp'};
-
-    # update reserves record....
-    if ($diffBranchSend) {
-    $query = "
-        UPDATE reserves
-        SET    priority = 0,
-               itemnumber = ?
-        WHERE borrowernumber = ?
-          AND biblionumber = ?
-          AND timestamp = ?
-    ";
-    }
-    else {
-    $query = "
-        UPDATE reserves
-        SET    priority = 0,
-               found = 'W',
-            waitingdate=now(),
-               itemnumber = ?
-        WHERE borrowernumber = ?
-          AND biblionumber = ?
-          AND timestamp = ?
-    ";
-    }
-    $sth = $dbh->prepare($query);
-    $sth->execute( $item, $borr, $biblio, $timestamp );
-    $sth->finish;
-
-    # now fix up the remaining priorities....
-    FixPriority( $data->{'priority'}, $biblio );
-    my $branchcode = $data->{'branchcode'};
-    return $branchcode;
-}
-
-#-------------------------------------------------------------------------------------
-
-=item GetWaitingReserves
-
address@hidden($borr);
-
-this funtion fetch the list of waiting reserves from database.
-
-=cut
-
-sub GetWaitingReserves {
-    my ($borr) = @_;
-    my $dbh = C4::Context->dbh;
-    my @itemswaiting;
-    my $query = "
-        SELECT *
-        FROM reserves
-        WHERE borrowernumber = ?
-          AND reserves.found = 'W'
-          AND cancellationdate IS NULL
-    ";
-    my $sth = $dbh->prepare($query);
-    $sth->execute($borr);
-    while ( my $data = $sth->fetchrow_hashref ) {
-        push( @itemswaiting, $data );
-    }
-    $sth->finish;
-    return address@hidden;
-}
-
-#-------------------------------------------------------------------------------------
-
-=item Findgroupreserve
-
-  @results = &Findgroupreserve($biblioitemnumber, $biblionumber);
-
-****** FIXME ******
-I don't know what this does, because I don't understand how reserve
-constraints work. I think the idea is that you reserve a particular
-biblio, and the constraint allows you to restrict it to a given
-biblioitem (e.g., if you want to borrow the audio book edition of "The
-Prophet", rather than the first available publication).
-
-C<&Findgroupreserve> returns :
-C<@results> is an array of references-to-hash whose keys are mostly
-fields from the reserves table of the Koha database, plus
-C<biblioitemnumber>.
-
-=cut
-
-#'
-sub Findgroupreserve {
-    my ( $bibitem, $biblio ) = @_;
-    my $dbh   = C4::Context->dbh;
-    my $query = qq/
-        SELECT reserves.biblionumber AS biblionumber,
-               reserves.borrowernumber AS borrowernumber,
-               reserves.reservedate AS reservedate,
-               reserves.branchcode AS branchcode,
-               reserves.cancellationdate AS cancellationdate,
-               reserves.found AS found,
-               reserves.reservenotes AS reservenotes,
-               reserves.priority AS priority,
-               reserves.timestamp AS timestamp,
-               reserveconstraints.biblioitemnumber AS biblioitemnumber,
-               reserves.itemnumber AS itemnumber
-        FROM reserves
-          LEFT JOIN reserveconstraints ON reserves.biblionumber = 
reserveconstraints.biblionumber
-        WHERE reserves.biblionumber = ?
-          AND ( ( reserveconstraints.biblioitemnumber = ?
-          AND reserves.borrowernumber = reserveconstraints.borrowernumber
-          AND reserves.reservedate    =reserveconstraints.reservedate )
-          OR  reserves.constrainttype='a' )
-          AND reserves.cancellationdate is NULL
-          AND (reserves.found <> 'F' or reserves.found is NULL)
-    /;
-    my $sth = $dbh->prepare($query);
-    $sth->execute( $biblio, $bibitem );
-    my @results;
-    while ( my $data = $sth->fetchrow_hashref ) {
-        push( @results, $data );
-    }
-    $sth->finish;
-    return @results;
-}
-
-=item CreateReserve
-
-CreateReserve($branch,$borrowernumber,$biblionumber,$constraint,$bibitems,$priority,$notes,$title,$checkitem,$found)
-
-FIXME - A somewhat different version of this function appears in
-C4::Reserves. Pick one and stick with it.
-
-=cut
-
-sub CreateReserve {
-    my (
-        $branch,    $borrowernumber, $biblionumber,
-        $constraint, $bibitems,  $priority,       $notes,
-        $title,      $checkitem, $found
-    ) = @_;
-    my $fee;
-    if ( $library_name =~ /Horowhenua/ ) {
-        $fee =
-          CalcHLTReserveFee($borrowernumber, $biblionumber, $constraint,
-            $bibitems );
-    }
-    else {
-        $fee =
-          CalcReserveFee($borrowernumber, $biblionumber, $constraint,
-            $bibitems );
-    }
-    my $dbh     = C4::Context->dbh;
-    my $const   = lc substr( $constraint, 0, 1 );
-    my @datearr = localtime(time);
-    my $resdate =
-      ( 1900 + $datearr[5] ) . "-" . ( $datearr[4] + 1 ) . "-" . $datearr[3];
-    my $waitingdate;
-
-    # If the reserv had the waiting status, we had the value of the resdate
-    if ( $found eq 'W' ) {
-        $waitingdate = $resdate;
-    }
-
-    #eval {
-    # updates take place here
-    if ( $fee > 0 ) {
-        my $nextacctno = &getnextacctno( $borrowernumber );
-        my $query      = qq/
-        INSERT INTO accountlines
-            
(borrowernumber,accountno,date,amount,description,accounttype,amountoutstanding)
-        VALUES
-            (?,?,now(),?,?,'Res',?)
-    /;
-        my $usth = $dbh->prepare($query);
-        $usth->execute( $borrowernumber, $nextacctno, $fee,
-            "Reserve Charge - $title", $fee );
-        $usth->finish;
-    }
-
-    #if ($const eq 'a'){
-    my $query = qq/
-        INSERT INTO reserves
-            (borrowernumber,biblionumber,reservedate,branchcode,constrainttype,
-            priority,reservenotes,itemnumber,found,waitingdate)
-        VALUES
-             (?,?,?,?,?,
-             ?,?,?,?,?)
-    /;
-    my $sth = $dbh->prepare($query);
-    $sth->execute(
-        $borrowernumber, $biblionumber, $resdate, $branch,
-        $const,          $priority,     $notes,   $checkitem,
-        $found,          $waitingdate
-    );
-    $sth->finish;
-
-    #}
-    if ( ( $const eq "o" ) || ( $const eq "e" ) ) {
-        my $numitems = @$bibitems;
-        my $i        = 0;
-        while ( $i < $numitems ) {
-            my $biblioitem = @$bibitems[$i];
-            my $query      = qq/
-          INSERT INTO reserveconstraints
-              (borrowernumber,biblionumber,reservedate,biblioitemnumber)
-          VALUES
-            (?,?,?,?)
-      /;
-            my $sth = $dbh->prepare("");
-            $sth->execute( $borrowernumber, $biblionumber, $resdate,
-                $biblioitem );
-            $sth->finish;
-            $i++;
-        }
-    }
-    return;
-}
-
-# FIXME - A functionally identical version of this function appears in
-# C4::Reserves. Pick one and stick with it.
-# XXX - Internal use only
-# FIXME - opac-reserves.pl need to use it, temporarily put into @EXPORT
-
-sub CalcReserveFee {
-    my ($borrowernumber, $biblionumber, $constraint, $bibitems ) = @_;
-
-    #check for issues;
-    my $dbh   = C4::Context->dbh;
-    my $const = lc substr( $constraint, 0, 1 );
-    my $query = qq/
-      SELECT * FROM borrowers,categories
-    WHERE borrowernumber = ?
-      AND borrowers.categorycode = categories.categorycode
-    /;
-    my $sth = $dbh->prepare($query);
-    $sth->execute($borrowernumber);
-    my $data = $sth->fetchrow_hashref;
-    $sth->finish();
-    my $fee      = $data->{'reservefee'};
-    my $cntitems = @- > $bibitems;
-
-    if ( $fee > 0 ) {
-
-        # check for items on issue
-        # first find biblioitem records
-        my @biblioitems;
-        my $sth1 = $dbh->prepare(
-            "SELECT * FROM biblio,biblioitems
-                   WHERE (biblio.biblionumber = ?)
-                     AND (biblio.biblionumber = biblioitems.biblionumber)"
-        );
-        $sth1->execute($biblionumber);
-        while ( my $data1 = $sth1->fetchrow_hashref ) {
-            if ( $const eq "a" ) {
-                push @biblioitems, $data1;
-            }
-            else {
-                my $found = 0;
-                my $x     = 0;
-                while ( $x < $cntitems ) {
-                    if ( @$bibitems->{'biblioitemnumber'} ==
-                        $data->{'biblioitemnumber'} )
-                    {
-                        $found = 1;
-                    }
-                    $x++;
-                }
-                if ( $const eq 'o' ) {
-                    if ( $found == 1 ) {
-                        push @biblioitems, $data1;
-                    }
-                }
-                else {
-                    if ( $found == 0 ) {
-                        push @biblioitems, $data1;
-                    }
-                }
-            }
-        }
-        $sth1->finish;
-        my $cntitemsfound = @biblioitems;
-        my $issues        = 0;
-        my $x             = 0;
-        my $allissued     = 1;
-        while ( $x < $cntitemsfound ) {
-            my $bitdata = $biblioitems[$x];
-            my $sth2    = $dbh->prepare(
-                "SELECT * FROM items
-                     WHERE biblioitemnumber = ?"
-            );
-            $sth2->execute( $bitdata->{'biblioitemnumber'} );
-            while ( my $itdata = $sth2->fetchrow_hashref ) {
-                my $sth3 = $dbh->prepare(
-                    "SELECT * FROM issues
-                       WHERE itemnumber = ?
-                         AND returndate IS NULL"
-                );
-                $sth3->execute( $itdata->{'itemnumber'} );
-                if ( my $isdata = $sth3->fetchrow_hashref ) {
-                }
-                else {
-                    $allissued = 0;
-                }
-            }
-            $x++;
-        }
-        if ( $allissued == 0 ) {
-            my $rsth =
-              $dbh->prepare("SELECT * FROM reserves WHERE biblionumber = ?");
-            $rsth->execute($biblionumber);
-            if ( my $rdata = $rsth->fetchrow_hashref ) {
-            }
-            else {
-                $fee = 0;
-            }
-        }
-    }
-
-    #  print "fee $fee";
-    return $fee;
-}
-
-# The following are junior and young adult item types that should not incur a
-# reserve charge.
-#
-# Juniors: BJC, BJCN, BJF, BJK, BJM, BJN, BJP, BJSF, BJSN, DJ, DJP, FJ, JVID,
-#  VJ, VJP, PJ, TJ, TJP, VJ, VJP.
-#
-# Young adults: BYF, BYN, BYP, DY, DYP, PY, PYP, TY, TYP, VY, VYP.
-#
-# All other item types should incur a reserve charge.
-sub CalcHLTReserveFee {
-    my ($borrowernumber, $biblionumber, $constraint, $bibitems ) = @_;
-    my $dbh = C4::Context->dbh;
-    my $sth = $dbh->prepare(
-        "SELECT * FROM borrowers,categories
-                  WHERE (borrowernumber = ?)
-                    AND (borrowers.categorycode = categories.categorycode)"
-    );
-    $sth->execute($borrowernumber);
-    my $data = $sth->fetchrow_hashref;
-    $sth->finish();
-    my $fee = $data->{'reservefee'};
-
-    my $matchno;
-    my @nocharge =
-      qw/BJC BJCN BJF BJK BJM BJN BJP BJSF BJSN DJ DJP FJ NJ CJ VJ VJP PJ TJ 
TJP BYF BYN BYP DY DYP PY PYP TY TYP VY VYP/;
-    $sth = $dbh->prepare(
-        "SELECT * FROM biblio,biblioitems
-                     WHERE (biblio.biblionumber = ?)
-                       AND (biblio.biblionumber = biblioitems.biblionumber)"
-    );
-    $sth->execute($biblionumber);
-    $data = $sth->fetchrow_hashref;
-    my $itemtype = $data->{'itemtype'};
-    for ( my $i = 0 ; $i < @nocharge ; $i++ ) {
-        if ( $itemtype eq $nocharge[$i] ) {
-            $matchno++;
-            last;
-        }
-    }
-
-    if ( $matchno > 0 ) {
-        $fee = 0;
-    }
-    return $fee;
-}
-
-=item GetNextAccountNumber
-
-GetNextAccountNumber()
-
-=cut
-
-sub GetNextAccountNumber {
-    my ($borrowernumber, $dbh ) = @_;
-    my $nextaccntno = 1;
-    my $sth         = $dbh->prepare(
-        "select * from accountlines
-  where (borrowernumber = ?)
-  order by accountno desc"
-    );
-    $sth->execute($borrowernumber);
-    if ( my $accdata = $sth->fetchrow_hashref ) {
-        $nextaccntno = $accdata->{'accountno'} + 1;
-    }
-    $sth->finish;
-    return ($nextaccntno);
-}
-
-#-------------------------------------------------------------------------------------
-
-=item UpdateReserve
-
-&UpdateReserve($rank,$biblio,$borrower,$branch)
-
-=cut
-
-sub UpdateReserve {
-    #subroutine to update a reserve
-    my ( $rank, $biblio, $borrower, $branch , $itemnumber) = @_;
-     return if $rank eq "W";
-     return if $rank eq "n";
-    my $dbh = C4::Context->dbh;
-    if ( $rank eq "del" ) {
-        my $query = qq/
-            UPDATE reserves
-            SET    cancellationdate=now()
-            WHERE  biblionumber   = ?
-             AND   borrowernumber = ?
-             AND   cancellationdate is NULL
-             AND   (found <> 'F' or found is NULL)
-        /;
-        my $sth = $dbh->prepare($query);
-        $sth->execute( $biblio, $borrower );
-        $sth->finish;
-        
-    }
-    else {
-        my $query = qq/
-        UPDATE reserves SET priority = ? ,branchcode = ?, itemnumber = ?, 
found = NULL
-            WHERE biblionumber   = ?
-             AND borrowernumber = ?
-             AND cancellationdate is NULL
-             AND (found <> 'F' or found is NULL)
-        /;
-        my $sth = $dbh->prepare($query);
-        $sth->execute( $rank, $branch,$itemnumber, $biblio, $borrower);
-        $sth->finish;
-        FixPriority( $biblio, $borrower, $rank);
-    }
-}
-
-=item GetReserveTitle
-
-$data = GetReserveTitle($biblio,$bor,$date,$timestamp);
-
-=cut
-
-sub GetReserveTitle {
-    my ( $biblio, $bor, $date, $timestamp ) = @_;
-    my $dbh   = C4::Context->dbh;
-    my $query = qq/
-        SELECT *
-        FROM   reserveconstraints,biblioitems
-        WHERE  reserveconstraints.biblioitemnumber=biblioitems.biblioitemnumber
-          AND   reserveconstraints.biblionumber=?
-         AND   reserveconstraints.borrowernumber = ?
-         AND   reserveconstraints.reservedate=?
-         AND   reserveconstraints.timestamp=?
-    /;
-    my $sth = $dbh->prepare($query);
-    $sth->execute( $biblio, $bor, $date, $timestamp );
-    my $data = $sth->fetchrow_hashref;
-    $sth->finish;
-    return $data;
-}
-
-=item FindReservesInQueue
-
-  $results = &FindReservesInQueue($biblionumber);
-
-Simple variant of FindReserves, exept the result is now displaying only the 
queue list of reservations with the same biblionumber (At this time only 
displayed in request.pl)
-
-C<&FindReservesInQueue> returns a two-element array:
-
-C<$results> is a reference to an array of references of hashes. Each hash
-has for keys a list of column from reserves table (see details in function).
-
-=cut
-
-#'
-
-sub FindReservesInQueue {
-    my ($biblionumber) = @_;
-    my $dbh = C4::Context->dbh;
-
-    # Find the desired items in the reserves
-    my $query = qq/
-        SELECT  branchcode,
-                timestamp AS rtimestamp,
-                priority,
-                biblionumber,
-                borrowernumber,
-                reservedate,
-                constrainttype,
-                found,
-                itemnumber
-          FROM     reserves
-          WHERE     cancellationdate IS NULL
-        AND biblionumber = ?
-          AND    (found <> \'F\' OR found IS NULL)
-          AND priority <> \'0\'
-          ORDER BY priority
-    /;
-    my $sth = $dbh->prepare($query);
-    $sth->execute($biblionumber);
-    my @results;
-    my $i = 0;
-    while ( my $data = $sth->fetchrow_hashref ) {
-
-        # FIXME - What is this if-statement doing? How do constraints work?
-        if ( $data->{constrainttype} eq 'o' ) {
-            $query = '
-                SELECT biblioitemnumber
-                FROM reserveconstraints
-                WHERE biblionumber   = ?
-                    AND borrowernumber = ?
-                  AND reservedate    = ?
-            ';
-            my $csth = $dbh->prepare($query);
-            $csth->execute( $data->{biblionumber}, $data->{borrowernumber},
-                $data->{reservedate}, );
-
-            my @bibitemno;
-            while ( my $bibitemnos = $csth->fetchrow_array ) {
-                push( @bibitemno, $bibitemnos );
-            }
-            my $count = @bibitemno;
-
-            # if we have two or more different specific itemtypes
-            # reserved by same person on same day
-            my $bdata;
-            if ( $count > 1 ) {
-                $bdata = GetBiblioItemData( $bibitemno[$i] );
-                $i++;
-            }
-            else {
-                # Look up the book we just found.
-                $bdata = GetBiblioItemData( $bibitemno[0] );
-            }
-            $csth->finish;
-
-            # Add the results of this latest search to the current
-            # results.
-            # FIXME - An 'each' would probably be more efficient.
-            foreach my $key ( keys %$bdata ) {
-                $data->{$key} = $bdata->{$key};
-            }
-        }
-        push @results, $data;
-    }
-    $sth->finish;
-
-    return ( $#results + 1, address@hidden );
-}
-
-
-=head2 GetReservesToBranch
-
address@hidden = GetReservesToBranch( $frombranch );
-
-Get reserve list for a given branch
-
-=cut
-
-sub GetReservesToBranch {
-    my ( $frombranch ) = @_;
-    my $dbh = C4::Context->dbh;
-    my $sth = $dbh->prepare(
-        "SELECT borrowernumber,reservedate,itemnumber,timestamp
-         FROM reserves 
-         WHERE priority='0' AND cancellationdate is null  
-           AND branchcode=?
-           AND found IS NULL "
-    );
-    $sth->execute( $frombranch );
-    my @transreserv;
-    my $i = 0;
-    while ( my $data = $sth->fetchrow_hashref ) {
-        $transreserv[$i] = $data;
-        $i++;
-    }
-    $sth->finish;
-    return (@transreserv);
-}
-
-=head2 GetReservesForBranch
-
address@hidden = GetReservesForBranch($frombranch);
-
-=cut
-
-sub GetReservesForBranch {
-    my ($frombranch) = @_;
-    my $dbh          = C4::Context->dbh;
-    my $sth          = $dbh->prepare( "
-        SELECT borrowernumber,reservedate,itemnumber,waitingdate
-        FROM   reserves 
-        WHERE   priority='0'
-            AND cancellationdate IS NULL 
-            AND found='W' 
-            AND branchcode=?
-        ORDER BY waitingdate" );
-    $sth->execute($frombranch);
-    my @transreserv;
-    my $i = 0;
-    while ( my $data = $sth->fetchrow_hashref ) {
-        $transreserv[$i] = $data;
-        $i++;
-    }
-    $sth->finish;
-    return (@transreserv);
-}
-
-=back
-
-=head1 AUTHOR
-
-Koha Developement team <address@hidden>
-
-=cut
-




reply via email to

[Prev in Thread] Current Thread [Next in Thread]