[LON-CAPA-cvs] cvs: loncom / lonsql

[harris41]

harris41		Sat May 11 17:26:53 2002 EDT

  Modified files:              
    /loncom	lonsql 
  Log:
  using LONCAPA::Configuration::read_conf
  BUG 129
  
  
Index: loncom/lonsql
diff -u loncom/lonsql:1.41 loncom/lonsql:1.42
--- loncom/lonsql:1.41	Thu Dec 20 12:43:05 2001
+++ loncom/lonsql	Sat May 11 17:26:53 2002
@@ -3,7 +3,7 @@
 # The LearningOnline Network
 # lonsql - LON TCP-MySQL-Server Daemon for handling database requests.
 #
-# $Id: lonsql,v 1.41 2001/12/20 17:43:05 harris41 Exp $
+# $Id: lonsql,v 1.42 2002/05/11 21:26:53 harris41 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,6 +36,8 @@
 # 03/22/2001 Scott Harrison
 # 8/30 Gerd Kortemeyer
 # 10/17,11/28,11/29,12/20 Scott Harrison
+# YEAR=2001
+# 5/11 Scott Harrison
 #
 ###
 
@@ -52,6 +54,9 @@
 ##                                                                           ##
 ###############################################################################
 
+use lib '/home/httpd/lib/perl/';
+use LONCAPA::Configuration;
+
 use IO::Socket;
 use Symbol;
 use POSIX;
@@ -75,17 +80,9 @@
 $childmaxattempts=10;
 $run =0;#running counter to generate the query-id
 
-# ------------------------------------ Read httpd access.conf and get variables
-open (CONFIG,"/etc/httpd/conf/access.conf") || die "Can't read access.conf";
-
-while ($configline=<CONFIG>) {
-    if ($configline =~ /PerlSetVar/) {
-	my ($dummy,$varname,$varvalue)=split(/\s+/,$configline);
-        chomp($varvalue);
-        $perlvar{$varname}=$varvalue;
-    }
-}
-close(CONFIG);
+# ------------------------------------------- Read access.conf and loncapa.conf
+my $perlvarref=LONCAPA::Configuration::read_conf('access.conf','loncapa.conf');
+my %perlvar=%{$perlvarref};
 
 # ------------------------------------- Make sure that database can be accessed
 {