[LON-CAPA-cvs] cvs: loncom /build/system_dependencies sqltest.pl

[harris41]

harris41		Sat May 11 17:33:30 2002 EDT

  Modified files:              
    /loncom/build/system_dependencies	sqltest.pl 
  Log:
  reading loncapa.conf as well... (not using LONCAPA::Configuration
  so as to reduce software dependency associated with this test)
  
  
Index: loncom/build/system_dependencies/sqltest.pl
diff -u loncom/build/system_dependencies/sqltest.pl:1.3 loncom/build/system_dependencies/sqltest.pl:1.4
--- loncom/build/system_dependencies/sqltest.pl:1.3	Thu May  9 21:32:38 2002
+++ loncom/build/system_dependencies/sqltest.pl	Sat May 11 17:33:30 2002
@@ -6,7 +6,8 @@
 #
 # YEAR=2001
 # 9/25,9/30 Scott Harrison
-#
+# YEAR=2002
+# 5/10,5/11 Scott Harrison
 
 ###############################################################################
 ##                                                                           ##
@@ -46,7 +47,17 @@
 open (CONFIG,"/etc/httpd/conf/access.conf") || 
     (print "Can't read access.conf\n" && exit);
 while (my $configline=<CONFIG>) {
-    if ($configline =~ /PerlSetVar/) {
+    if ($configline =~ /^[^\#]*PerlSetVar/) {
+	my ($dummy,$varname,$varvalue)=split(/\s+/,$configline);
+        chomp($varvalue);
+        $perlvar{$varname}=$varvalue;
+    }
+}
+close(CONFIG);
+open (CONFIG,"/etc/httpd/conf/loncapa.conf") || 
+    (print "Can't read loncapa.conf\n" && exit);
+while (my $configline=<CONFIG>) {
+    if ($configline =~ /^[^\#]*PerlSetVar/) {
 	my ($dummy,$varname,$varvalue)=split(/\s+/,$configline);
         chomp($varvalue);
         $perlvar{$varname}=$varvalue;