[Koha-cvs] CVS: koha/admin aqbookfund.pl,1.20,1.21 printers.pl,1.10,1.11 z3950servers.pl,1.9,1.10

[Paul POULAIN]

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

Modified Files:
        aqbookfund.pl printers.pl z3950servers.pl 
Log Message:
synch'ing 2.2 and head

Index: aqbookfund.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/aqbookfund.pl,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** aqbookfund.pl       23 Mar 2005 09:40:42 -0000      1.20
--- aqbookfund.pl       4 May 2005 08:50:48 -0000       1.21
***************
*** 45,48 ****
--- 45,49 ----
  use C4::Interface::CGI::Output;
  use C4::Search;
+ use C4::Date;
  use HTML::Template;
  
***************
*** 183,188 ****
                        my %budgetrow_data;
                        $budgetrow_data{aqbudgetid} = $aqbudgetid;
!                       $budgetrow_data{startdate} = $startdate;
!                       $budgetrow_data{enddate} = $enddate;
                        $budgetrow_data{budgetamount} = $budgetamount;
                        push @budget_loop,\%budgetrow_data;
--- 184,189 ----
                        my %budgetrow_data;
                        $budgetrow_data{aqbudgetid} = $aqbudgetid;
!                       $budgetrow_data{startdate} = format_date($startdate);
!                       $budgetrow_data{enddate} = format_date($enddate);
                        $budgetrow_data{budgetamount} = $budgetamount;
                        push @budget_loop,\%budgetrow_data;

Index: printers.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/printers.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** printers.pl 12 Jan 2004 16:55:06 -0000      1.10
--- printers.pl 4 May 2005 08:50:48 -0000       1.11
***************
*** 126,130 ****
        $template->param(delete_confirm => 1);
        my $dbh = C4::Context->dbh;
!       my $sth=$dbh->prepare("select printername,printqueue,printtype from 
printers where printername=");
        $sth->execute($searchfield);
        my $data=$sth->fetchrow_hashref;
--- 126,130 ----
        $template->param(delete_confirm => 1);
        my $dbh = C4::Context->dbh;
!       my $sth=$dbh->prepare("select printername,printqueue,printtype from 
printers where printername=?");
        $sth->execute($searchfield);
        my $data=$sth->fetchrow_hashref;

Index: z3950servers.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/z3950servers.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** z3950servers.pl     12 Jan 2004 16:55:06 -0000      1.9
--- z3950servers.pl     4 May 2005 08:50:49 -0000       1.10
***************
*** 164,168 ****
        my ($count,$results)=StringSearch($env,$searchfield,'web');
        my @loop;
!       my $toggle = 'white';
        for (my $i=$offset; $i < 
($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
                        
--- 164,168 ----
        my ($count,$results)=StringSearch($env,$searchfield,'web');
        my @loop;
!       my $toggle = 0;
        for (my $i=$offset; $i < 
($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
                        
***************
*** 181,191 ****
                push @loop, \%row;
  
!                 if ( $toggle eq 'white' )
                  {
!                         $toggle = '#ffffcc';
                  }
                  else
                  {
!                         $toggle = 'white';
                  }
  
--- 181,191 ----
                push @loop, \%row;
  
!                 if ( $toggle eq 0 )
                  {
!                         $toggle = 1;
                  }
                  else
                  {
!                         $toggle = 0;
                  }