Diff for /loncom/configuration/Configuration.pm between versions 1.6 and 1.7

version 1.6, 2002/05/17 14:03:04 version 1.7, 2002/09/09 13:57:37
Line 31 Line 31
 #  #
 ###  ###
   
   # POD documentation is at the end of this short module.
   
 package LONCAPA::Configuration;  package LONCAPA::Configuration;
   
 $VERSION = sprintf("%d.%02d", q$Revision$ =~ /(\d+)\.(\d+)/);  $VERSION = sprintf("%d.%02d", q$Revision$ =~ /(\d+)\.(\d+)/);
Line 39  use strict; Line 41  use strict;
   
 my $confdir='/etc/httpd/conf/';  my $confdir='/etc/httpd/conf/';
   
 # ------------------------------------ read_conf: read LON-CAPA server configuration, especially PerlSetVar values  # ------------------- Subroutine read_conf: read LON-CAPA server configuration.
 sub read_conf {  # This subroutine reads PerlSetVar values out of specified web server
   # configuration files.
   sub read_conf
     {
     my (@conf_files)=@_;      my (@conf_files)=@_;
     my %perlvar;      my %perlvar;
     foreach my $filename (@conf_files,'loncapa_apache.conf') {      foreach my $filename (@conf_files,'loncapa_apache.conf')
  open(CONFIG,'<'.$confdir.$filename) or die("Can't read $confdir$filename");        {
  while (my $configline=<CONFIG>) {   open(CONFIG,'<'.$confdir.$filename) or
     if ($configline =~ /^[^\#]*PerlSetVar/) {      die("Can't read $confdir$filename");
    while (my $configline=<CONFIG>)
     {
       if ($configline =~ /^[^\#]*PerlSetVar/)
         {
  my ($unused,$varname,$varvalue)=split(/\s+/,$configline);   my ($unused,$varname,$varvalue)=split(/\s+/,$configline);
  chomp($varvalue);   chomp($varvalue);
  $perlvar{$varname}=$varvalue;   $perlvar{$varname}=$varvalue;
     }        }
  }    }
  close(CONFIG);   close(CONFIG);
     }        }
     my $perlvarref=\%perlvar;      my $perlvarref=\%perlvar;
     return ($perlvarref);      return ($perlvarref);
 }    }
   
 __END__  __END__
   
Line 71  B<LONCAPA::Configuration> - configuratio Line 80  B<LONCAPA::Configuration> - configuratio
  use lib '/home/httpd/lib/perl/';   use lib '/home/httpd/lib/perl/';
  use LONCAPA::Configuration;   use LONCAPA::Configuration;
   
  LONCAPA::Configuration::read_conf('loncapa_apache.conf','loncapa.conf');   LONCAPA::Configuration::read_conf('loncapa.conf');
   
 =head1 DESCRIPTION  =head1 DESCRIPTION
   

Removed from v.1.6  
changed lines
  Added in v.1.7


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>