Diff for /loncom/lonsql between versions 1.41 and 1.42

version 1.41, 2001/12/20 17:43:05 version 1.42, 2002/05/11 21:26:53
Line 36 Line 36
 # 03/22/2001 Scott Harrison  # 03/22/2001 Scott Harrison
 # 8/30 Gerd Kortemeyer  # 8/30 Gerd Kortemeyer
 # 10/17,11/28,11/29,12/20 Scott Harrison  # 10/17,11/28,11/29,12/20 Scott Harrison
   # YEAR=2001
   # 5/11 Scott Harrison
 #  #
 ###  ###
   
Line 52 Line 54
 ##                                                                           ##  ##                                                                           ##
 ###############################################################################  ###############################################################################
   
   use lib '/home/httpd/lib/perl/';
   use LONCAPA::Configuration;
   
 use IO::Socket;  use IO::Socket;
 use Symbol;  use Symbol;
 use POSIX;  use POSIX;
Line 75  sub wanted { Line 80  sub wanted {
 $childmaxattempts=10;  $childmaxattempts=10;
 $run =0;#running counter to generate the query-id  $run =0;#running counter to generate the query-id
   
 # ------------------------------------ Read httpd access.conf and get variables  # ------------------------------------------- Read access.conf and loncapa.conf
 open (CONFIG,"/etc/httpd/conf/access.conf") || die "Can't read access.conf";  my $perlvarref=LONCAPA::Configuration::read_conf('access.conf','loncapa.conf');
   my %perlvar=%{$perlvarref};
 while ($configline=<CONFIG>) {  
     if ($configline =~ /PerlSetVar/) {  
  my ($dummy,$varname,$varvalue)=split(/\s+/,$configline);  
         chomp($varvalue);  
         $perlvar{$varname}=$varvalue;  
     }  
 }  
 close(CONFIG);  
   
 # ------------------------------------- Make sure that database can be accessed  # ------------------------------------- Make sure that database can be accessed
 {  {

Removed from v.1.41  
changed lines
  Added in v.1.42


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