Diff for /loncom/build/system_dependencies/sqltest.pl between versions 1.8 and 1.10

version 1.8, 2002/08/07 18:43:42 version 1.10, 2003/02/03 03:57:39
Line 146  use DBI;    # Needed to interface with t Line 146  use DBI;    # Needed to interface with t
   
 # ============================================================ Initializations.  # ============================================================ Initializations.
 $|=1;  $|=1;
 print 'Probing for SQL metadata database'."\n\n";  print 'Probing for SQL loncapa database'."\n\n";
   
 # ============================================== Read in current configuration.  # ============================================== Read in current configuration.
 my %perlvar;  my %perlvar;
   
 my $webconfdir='/etc/httpd/conf/';  my $webconfdir='/etc/httpd/conf/';
   
 # NOTE: DEPRECATED scanning of access.conf  
 &configuration_scan(\%perlvar,$webconfdir.'access.conf');  
   
 # Scanning the standard loncapa configuration files.  # Scanning the standard loncapa configuration files.
 &configuration_scan(\%perlvar,$webconfdir.'loncapa.conf');  &configuration_scan(\%perlvar,$webconfdir.'loncapa.conf');
 &configuration_scan(\%perlvar,$webconfdir.'loncapa_apache.conf');  &configuration_scan(\%perlvar,$webconfdir.'loncapa_apache.conf');
Line 292  END Line 289  END
 }  }
 %perlvar=(); # clear memory  %perlvar=(); # clear memory
   
 print('SQL metadata database is found and is accessible'."\n");  print('SQL loncapa database is found and is accessible'."\n");
   
 # ================================================== Close database connection.  # ================================================== Close database connection.
 $dbh->disconnect();  $dbh->disconnect();
Line 302  $dbh->disconnect(); Line 299  $dbh->disconnect();
 # --------- configuration_scan: look for PerlSetVar and store in hash variable.  # --------- configuration_scan: look for PerlSetVar and store in hash variable.
 sub configuration_scan {  sub configuration_scan {
     my ($storagehashref,$filename)=@_;      my ($storagehashref,$filename)=@_;
     # deprecated support for access.conf  
     open(CONFIG,$filename) or      open(CONFIG,$filename) or
  ($filename=~/access\.conf$/ and return) or  
  (print("Can't read $filename\n") && exit(1));   (print("Can't read $filename\n") && exit(1));
     while (my $configline=<CONFIG>) {      while (my $configline=<CONFIG>) {
  if ($configline =~ /^[^\#]*PerlSetVar/) {   if ($configline =~ /^[^\#]*PerlSetVar/) {

Removed from v.1.8  
changed lines
  Added in v.1.10


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