--- loncom/lonsql	2001/11/29 14:59:52	1.40
+++ loncom/lonsql	2002/05/11 21:26:53	1.42
@@ -3,6 +3,30 @@
 # The LearningOnline Network
 # lonsql - LON TCP-MySQL-Server Daemon for handling database requests.
 #
+# $Id: lonsql,v 1.42 2002/05/11 21:26:53 harris41 Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
 # YEAR=2000
 # lonsql-based on the preforker:harsha jagasia:date:5/10/00
 # 7/25 Gerd Kortemeyer
@@ -11,9 +35,10 @@
 # many different dates Scott Harrison
 # 03/22/2001 Scott Harrison
 # 8/30 Gerd Kortemeyer
-# 10/17,11/28,11/29 Scott Harrison
+# 10/17,11/28,11/29,12/20 Scott Harrison
+# YEAR=2001
+# 5/11 Scott Harrison
 #
-# $Id: lonsql,v 1.40 2001/11/29 14:59:52 harris41 Exp $
 ###
 
 ###############################################################################
@@ -29,6 +54,9 @@
 ##                                                                           ##
 ###############################################################################
 
+use lib '/home/httpd/lib/perl/';
+use LONCAPA::Configuration;
+
 use IO::Socket;
 use Symbol;
 use POSIX;
@@ -52,17 +80,9 @@ sub wanted {
 $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
 {
@@ -285,11 +305,11 @@ sub make_new_child {
 		else {
 		    my $r1=$sth->fetchall_arrayref;
 		    my @r2;
-		    map {my $a=$_; 
+		    foreach (@$r1) {my $a=$_; 
 			 my @b=map {escape($_)} @$a;
 			 push @files,@{$a}[3];
 			 push @r2,join(",", @b)
-			 } (@$r1);
+			 }
 		    $result=join("&",@r2);
 		}
 	    }
@@ -337,11 +357,11 @@ sub make_new_child {
 			    my $sth = $dbh->prepare($q2);
 			    $sth->execute();
 			    my $r1=$sth->fetchall_arrayref;
-			    map {my $a=$_; 
+			    foreach (@$r1) {my $a=$_; 
 				 my @b=map {escape($_)} @$a;
 				 push @files,@{$a}[3];
 				 push @r2,join(",", @b)
-				 } (@$r1);
+				 }
 			}
 #			&logthis("found: $stuff");
 			$customresult.='&custom='.escape($m2).','.escape($stuff);
@@ -491,11 +511,11 @@ the parent process.
 
 =head1 DESCRIPTION
 
-LON TCP-MySQL-Server Daemon for handling database requests.
+Not yet written.
 
 =head1 README
 
-LON TCP-MySQL-Server Daemon for handling database requests.
+Not yet written.
 
 =head1 PREREQUISITES