[Koha-cvs] CVS: koha/C4 Output.pm,1.8,1.9
Gynn Lomax
truth_nz at users.sourceforge.net
Wed May 15 06:08:40 CEST 2002
Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv1570/C4
Modified Files:
Output.pm
Log Message:
Fixed a few warnings.
Index: Output.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Output.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** Output.pm 14 May 2002 23:13:23 -0000 1.8
--- Output.pm 15 May 2002 04:08:38 -0000 1.9
***************
*** 49,75 ****
open (KC, "/etc/koha.conf");
while (<KC>) {
! chomp;
! (next) if (/^\s*#/);
! if (/(.*)\s*=\s*(.*)/) {
! my $variable=$1;
! my $value=$2;
! # Clean up white space at beginning and end
! $variable=~s/^\s*//g;
! $variable=~s/\s*$//g;
! $value=~s/^\s*//g;
! $value=~s/\s*$//g;
! $configfile{$variable}=$value;
! }
! }
my $path=$configfile{'includes'};
($path) || ($path="/usr/local/www/hdl/htdocs/includes");
-
- # here's a file-private function as a closure,
- # callable as &$priv_func; it cannot be prototyped.
- my $priv_func = sub {
- # stuff goes here.
- };
-
# make all your functions, whether exported or not;
--- 49,70 ----
open (KC, "/etc/koha.conf");
while (<KC>) {
! chomp;
! (next) if (/^\s*#/);
! if (/(.*)\s*=\s*(.*)/) {
! my $variable=$1;
! my $value=$2;
!
! $variable =~ s/^\s*//g;
! $variable =~ s/\s*$//g;
! $value =~ s/^\s*//g;
! $value =~ s/\s*$//g;
! $configfile{$variable}=$value;
! } # if
! } # while
! close(KC);
!
my $path=$configfile{'includes'};
($path) || ($path="/usr/local/www/hdl/htdocs/includes");
# make all your functions, whether exported or not;
***************
*** 124,128 ****
open (FILE,"$path/members-top.inc") || die;
} elsif ($type eq 'acquisitions'){
! open (FILE,"$path/acquisitions-top.inc")|| die;
} elsif ($type eq 'report'){
open (FILE,"$path/reports-top.inc") || die;
--- 119,124 ----
open (FILE,"$path/members-top.inc") || die;
} elsif ($type eq 'acquisitions'){
! open (FILE,"$path/acquisitions-top.inc")
! || die "Cannot open $path/acquisitions-top.inc";
} elsif ($type eq 'report'){
open (FILE,"$path/reports-top.inc") || die;
***************
*** 140,146 ****
! sub endmenu{
! my ($type)=@_;
! if ($type eq 'issue'){
open (FILE,"$path/issues-bottom.inc") || die;
} elsif ($type eq 'opac') {
--- 136,142 ----
! sub endmenu {
! my ($type) = @_;
! if ($type eq 'issue') {
open (FILE,"$path/issues-bottom.inc") || die;
} elsif ($type eq 'opac') {
***************
*** 371,375 ****
$ltext = $ltext." (Req)";
}
! @order[$posn] =mktablerow(2,'white',$ltext,$text);
}
}
--- 367,371 ----
$ltext = $ltext." (Req)";
}
! $order[$posn] =mktablerow(2,'white',$ltext,$text);
}
}
More information about the Koha-cvs
mailing list