--- loncom/lonsql 2001/04/17 15:47:19 1.35 +++ loncom/lonsql 2001/11/29 13:53:56 1.39 @@ -1,8 +1,22 @@ #!/usr/bin/perl + +# The LearningOnline Network +# lonsql - LON TCP-MySQL-Server +# +# YEAR=2000 # lonsql-based on the preforker:harsha jagasia:date:5/10/00 # 7/25 Gerd Kortemeyer # many different dates Scott Harrison +# YEAR=2001 +# many different dates Scott Harrison # 03/22/2001 Scott Harrison +# 8/30 Gerd Kortemeyer +# 10/17,11/28,11/29 Scott Harrison +# +# $Id: lonsql,v 1.39 2001/11/29 13:53:56 harris41 Exp $ +### + + use IO::Socket; use Symbol; use POSIX; @@ -45,7 +59,11 @@ close(CONFIG); $dbh = DBI->connect("DBI:mysql:loncapa","www",$perlvar{'lonSqlAccess'},{ RaiseError =>0,PrintError=>0}) ) { print "Cannot connect to database!\n"; - exit; + $emailto="$perlvar{'lonAdmEMail'},$perlvar{'lonSysEMail'}"; + $subj="LON: $perlvar{'lonHostID'} Cannot connect to database!"; + system("echo 'Cannot connect to MySQL database!' |\ + mailto $emailto -s '$subj' > /dev/null"); + exit 1; } else { $dbh->disconnect; @@ -79,6 +97,8 @@ while ($configline=) { } close(CONFIG); +$PREFORK=int($PREFORK/4); + $unixsock = "mysqlsock"; my $localfile="$perlvar{'lonSockDir'}/$unixsock"; my $server; @@ -295,7 +315,7 @@ sub make_new_child { 'creationdate','keywords','language', 'lastrevisiondate','mime','notes', 'owner','subject','title') { - $stuff=~s/\n?\<$f[^\>]*\>.*?<\/$f[^\>]*\>\n?//; + $stuff=~s/\n?\<$f[^\>]*\>.*?<\/$f[^\>]*\>\n?//s; } my $m2=$m; my $docroot=$perlvar{'lonDocRoot'}; $m2=~s/^$docroot//;