[Koha-cvs] CVS: koha/admin aqbookfund.pl,1.18,1.19 categoryitem.pl,1.8,1.9 itemtypes.pl,1.12,1.13

[Paul POULAIN]

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25270/admin

Modified Files:
        aqbookfund.pl categoryitem.pl itemtypes.pl 
Log Message:
continuing code cleaning & reordering

Index: aqbookfund.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/aqbookfund.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** aqbookfund.pl       14 Apr 2004 19:44:33 -0000      1.18
--- aqbookfund.pl       4 May 2004 16:17:35 -0000       1.19
***************
*** 142,149 ****
  } elsif ($op eq 'delete_confirm') {
        my $dbh = C4::Context->dbh;
- #     my $sth=$dbh->prepare("select count(*) as total from categoryitem where 
itemtype='$itemtype'");
- #     $sth->execute;
- #     my $total = $sth->fetchrow_hashref;
- #     $sth->finish;
        my $sth=$dbh->prepare("select bookfundid,bookfundname,bookfundgroup 
from aqbookfund where bookfundid=?");
        $sth->execute($bookfundid);
--- 142,145 ----

Index: categoryitem.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/categoryitem.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** categoryitem.pl     12 Jan 2004 16:55:05 -0000      1.8
--- categoryitem.pl     4 May 2004 16:17:35 -0000       1.9
***************
*** 93,97 ****
        if ($categorycode) {
                my $dbh = C4::Context->dbh;
!               my $sth=$dbh->prepare("select 
categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,finetype,bulk,enrolmentfee,issuelimit,reservefee,overduenoticerequired
 from categories where categorycode=?");
                $sth->execute($categorycode);
                $data=$sth->fetchrow_hashref;
--- 93,97 ----
        if ($categorycode) {
                my $dbh = C4::Context->dbh;
!               my $sth=$dbh->prepare("select 
categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,finetype,bulk,enrolmentfee,reservefee,overduenoticerequired
 from categories where categorycode=?");
                $sth->execute($categorycode);
                $data=$sth->fetchrow_hashref;
***************
*** 107,111 ****
                                  enrolmentfee            => 
$data->{'enrolmentfee'},
                                  overduenoticerequired   => 
$data->{'overduenoticerequired'},
-                                 issuelimit              => 
$data->{'issuelimit'},
                                  reservefee              => 
$data->{'reservefee'});
  
--- 107,110 ----
***************
*** 118,123 ****
        $template->param(add_validate => 1);
        my $dbh = C4::Context->dbh;
!       my $sth=$dbh->prepare("replace categories 
(categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,finetype,bulk,enrolmentfee,issuelimit,reservefee,overduenoticerequired)
 values (?,?,?,?,?,?,?,?,?,?,?)");
!       $sth->execute(map {$input->param($_)} 
('categorycode','description','enrolmentperiod','upperagelimit','dateofbirthrequired','finetype','bulk','enrolmentfee','issuelimit','reservefee','overduenoticerequired'));
        $sth->finish;
        print "data recorded";
--- 117,122 ----
        $template->param(add_validate => 1);
        my $dbh = C4::Context->dbh;
!       my $sth=$dbh->prepare("replace categories 
(categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,finetype,bulk,enrolmentfee,reservefee,overduenoticerequired)
 values (?,?,?,?,?,?,?,?,?,?)");
!       $sth->execute(map {$input->param($_)} 
('categorycode','description','enrolmentperiod','upperagelimit','dateofbirthrequired','finetype','bulk','enrolmentfee','reservefee','overduenoticerequired'));
        $sth->finish;
        print "data recorded";
***************
*** 136,140 ****
        print "TOTAL : $categorycode : $total->{'total'}<br>";
        $sth->finish;
!       my $sth2=$dbh->prepare("select 
categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,finetype,bulk,enrolmentfee,issuelimit,reservefee,overduenoticerequired
 from categories where categorycode=?");
        $sth2->execute($categorycode);
        my $data=$sth2->fetchrow_hashref;
--- 135,139 ----
        print "TOTAL : $categorycode : $total->{'total'}<br>";
        $sth->finish;
!       my $sth2=$dbh->prepare("select 
categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,finetype,bulk,enrolmentfee,reservefee,overduenoticerequired
 from categories where categorycode=?");
        $sth2->execute($categorycode);
        my $data=$sth2->fetchrow_hashref;
***************
*** 149,153 ****
                                  enrolmentfee            => 
$data->{'enrolmentfee'},
                                  overduenoticerequired   => 
$data->{'overduenoticerequired'},
-                                 issuelimit              => 
$data->{'issuelimit'},
                                  reservefee              => 
$data->{'reservefee'});
  
--- 148,151 ----
***************
*** 179,183 ****
                                  enrolmentfee => 
$results->[$i]{'enrolmentfee'},
                                  overduenoticerequired => 
$results->[$i]{'overduenoticerequired'},
-                                 issuelimit => $results->[$i]{'issuelimit'},
                                  reservefee => $results->[$i]{'reservefee'},
                                toggle => $toggle );
--- 177,180 ----

Index: itemtypes.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/itemtypes.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** itemtypes.pl        11 Feb 2004 08:40:10 -0000      1.12
--- itemtypes.pl        4 May 2004 16:17:35 -0000       1.13
***************
*** 144,148 ****
        # Check both categoryitem and biblioitems, see Bug 199
        my $total = 0;
!       for my $table ('categoryitem', 'biblioitems') {
           my $sth=$dbh->prepare("select count(*) as total from $table where 
itemtype=?");
           $sth->execute($itemtype);
--- 144,148 ----
        # Check both categoryitem and biblioitems, see Bug 199
        my $total = 0;
!       for my $table ('issuingrules', 'biblioitems') {
           my $sth=$dbh->prepare("select count(*) as total from $table where 
itemtype=?");
           $sth->execute($itemtype);