[Koha-cvs] Changes to koha/circ/reserve.pl [rel_2_2]

[Henri-Damien LAURENT]

Index: koha/circ/reserve.pl
diff -u koha/circ/reserve.pl:1.1.2.1 koha/circ/reserve.pl:1.1.2.2
--- koha/circ/reserve.pl:1.1.2.1        Wed Nov 30 16:18:02 2005
+++ koha/circ/reserve.pl        Mon Dec  5 16:07:54 2005
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: reserve.pl,v 1.1.2.1 2005/11/30 16:18:02 hdl Exp $
+# $Id: reserve.pl,v 1.1.2.2 2005/12/05 16:07:54 hdl Exp $
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -69,9 +69,9 @@
 my $todaysdate = (1900+$datearr[5]).'-'.sprintf ("%0.2d", 
($datearr[4]+1)).'-'.sprintf ("%0.2d", $datearr[3]);
 
 my $dbh = C4::Context->dbh;
-my $strsth="select reservedate,reserves.borrowernumber as bornum, 
concat(firstname,' ',surname) as borrower, borrowers.phone, 
borrowers.emailaddress,reserves.biblionumber, itemnumber, notes, 
notificationdate, reminderdate, priority, biblio.title, biblio.author from 
reserves, borrowers,biblio where isnull(cancellationdate) && 
reserves.borrowernumber=borrowers.borrowernumber && 
reserves.biblionumber=biblio.biblionumber order by reservedate, borrower ";
-$strsth="select reservedate,reserves.borrowernumber as 
bornum,concat(firstname,' ',surname) as borrower, borrowers.phone, 
borrowers.emailaddress,reserves.biblionumber, itemnumber, notes, 
notificationdate, reminderdate, priority, biblio.title, biblio.author from 
reserves, borrowers,biblio where isnull(cancellationdate) && 
reserves.borrowernumber=borrowers.borrowernumber && 
reserves.biblionumber=biblio.biblionumber order by borrower,reservedate " if 
($order eq "borrower");
-$strsth="select reservedate,reserves.borrowernumber as 
bornum,concat(firstname,' ',surname) as borrower, borrowers.phone, 
borrowers.emailaddress,reserves.biblionumber, itemnumber, notes, 
notificationdate, reminderdate, priority, biblio.title, biblio.author from 
reserves, borrowers,biblio where isnull(cancellationdate) && 
reserves.borrowernumber=borrowers.borrowernumber && 
reserves.biblionumber=biblio.biblionumber order by biblio.title, 
priority,reservedate " if ($order eq "biblio");
+my $strsth="select reservedate,reserves.borrowernumber as bornum, 
concat(firstname,' ',surname) as borrower, borrowers.phone, 
borrowers.emailaddress,reserves.biblionumber, reserves.branchcode as branch, 
items.holdingbranch, items.itemcallnumber, items.itemnumber, notes, 
notificationdate, reminderdate, priority, reserves.found, biblio.title, 
biblio.author from reserves left join items on 
items.itemnumber=reserves.itemnumber, borrowers,biblio where 
isnull(cancellationdate) && reserves.borrowernumber=borrowers.borrowernumber && 
reserves.biblionumber=biblio.biblionumber order by reservedate, borrower ";
+$strsth="select reservedate,reserves.borrowernumber as 
bornum,concat(firstname,' ',surname) as borrower, borrowers.phone, 
borrowers.emailaddress,reserves.biblionumber, reserves.branchcode as branch, 
items.holdingbranch, items.itemcallnumber, items.itemnumber, notes, 
notificationdate, reminderdate, priority, reserves.found, biblio.title, 
biblio.author from reserves left join items on  
items.itemnumber=reserves.itemnumber , borrowers,biblio where 
isnull(cancellationdate) && reserves.borrowernumber=borrowers.borrowernumber && 
reserves.biblionumber=biblio.biblionumberorder by borrower,reservedate " if 
($order eq "borrower");
+$strsth="select reservedate,reserves.borrowernumber as 
bornum,concat(firstname,' ',surname) as borrower, borrowers.phone, 
borrowers.emailaddress,reserves.biblionumber, reserves.branchcode as branch, 
items.holdingbranch, items.itemcallnumber, items.itemnumber, notes, 
notificationdate, reminderdate, priority, reserves.found, biblio.title, 
biblio.author from reserves left join items on 
items.itemnumber=reserves.itemnumber, borrowers,biblio where 
isnull(cancellationdate) && reserves.borrowernumber=borrowers.borrowernumber && 
reserves.biblionumber=biblio.biblionumber order by biblio.title, 
priority,reservedate " if ($order eq "biblio");
 my $sth=$dbh->prepare($strsth);
 warn "".$strsth;
 $sth->execute();
@@ -90,6 +90,11 @@
                                phone        => $data->{phone},
                                email        => $data->{email},
                                biblionumber => $data->{biblionumber},
+                               statusw          => ($data->{found} eq "w"),
+                               statusf          => ($data->{found} eq "f"),
+                               holdingbranch            => 
$data->{holdingbranch},
+                               branch           => $data->{branch},
+                               itemcallnumber => $data->{itemcallnumber},
                                notes            => $data->{notes},
                                notificationdate => $data->{notificationdate},
                                reminderdate => $data->{reminderdate}