--- loncom/build/system_dependencies/sqltest.pl 2002/08/07 18:43:42 1.8 +++ loncom/build/system_dependencies/sqltest.pl 2003/02/03 18:03:52 1.11 @@ -2,7 +2,7 @@ # sqltest.pl - script to test MySQL database connectivity for LON-CAPA # -# $Id: sqltest.pl,v 1.8 2002/08/07 18:43:42 harris41 Exp $ +# $Id: sqltest.pl,v 1.11 2003/02/03 18:03:52 harris41 Exp $ # ### @@ -17,10 +17,7 @@ B - Test interoperability of # Written to help LON-CAPA (The LearningOnline Network with CAPA) # # YEAR=2001 -# 9/25,9/30 Scott Harrison # YEAR=2002 -# 5/10,5/11 Scott Harrison -# 8/6/2002 and onwards, Scott Harrison, sharrison@users.sourceforge.net =pod @@ -113,8 +110,6 @@ Ratings: 1=horrible 2=poor 3=fair 4=good =head1 AUTHOR -Scott Harrison, sharrison@users.sourceforge.net, 2001, 2002 - This software is distributed under the General Public License, version 2, June 1991 (which is the same terms as LON-CAPA). @@ -135,7 +130,7 @@ Foundation, Inc., 59 Temple Place, Suite =cut # =================================== Process version information of this file. -my $VERSION = sprintf("%d.%02d", q$Revision: 1.8 $ =~ /(\d+)\.(\d+)/); +my $VERSION = sprintf("%d.%02d", q$Revision: 1.11 $ =~ /(\d+)\.(\d+)/); print('Running sqltest.pl, version '.$VERSION.'.'."\n"); print('(Test interoperability of the MySQL server for use by LON-CAPA.)'."\n"); @@ -146,16 +141,13 @@ use DBI; # Needed to interface with t # ============================================================ Initializations. $|=1; -print 'Probing for SQL metadata database'."\n\n"; +print 'Probing for SQL loncapa database'."\n\n"; # ============================================== Read in current configuration. my %perlvar; my $webconfdir='/etc/httpd/conf/'; -# NOTE: DEPRECATED scanning of access.conf -&configuration_scan(\%perlvar,$webconfdir.'access.conf'); - # Scanning the standard loncapa configuration files. &configuration_scan(\%perlvar,$webconfdir.'loncapa.conf'); &configuration_scan(\%perlvar,$webconfdir.'loncapa_apache.conf'); @@ -292,7 +284,7 @@ END } %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. $dbh->disconnect(); @@ -302,9 +294,7 @@ $dbh->disconnect(); # --------- configuration_scan: look for PerlSetVar and store in hash variable. sub configuration_scan { my ($storagehashref,$filename)=@_; - # deprecated support for access.conf open(CONFIG,$filename) or - ($filename=~/access\.conf$/ and return) or (print("Can't read $filename\n") && exit(1)); while (my $configline=) { if ($configline =~ /^[^\#]*PerlSetVar/) {