loncom/lonsql - diff

Return to lonsql CVS log

Up to [LON-CAPA] / loncom

Diff for /loncom/lonsql between versions 1.35 and 1.38

version 1.35, 2001/04/17 15:47:19	version 1.38, 2001/11/28 21:49:27
Line 3	Line 3
# 7/25 Gerd Kortemeyer	# 7/25 Gerd Kortemeyer
# many different dates Scott Harrison	# many different dates Scott Harrison
# 03/22/2001 Scott Harrison	# 03/22/2001 Scott Harrison
	# 8/30 Gerd Kortemeyer

use IO::Socket;	use IO::Socket;
use Symbol;	use Symbol;
use POSIX;	use POSIX;
Line 45 close(CONFIG);	Line 47 close(CONFIG);
$dbh = DBI->connect("DBI:mysql:loncapa","www",$perlvar{'lonSqlAccess'},{ RaiseError =>0,PrintError=>0})	$dbh = DBI->connect("DBI:mysql:loncapa","www",$perlvar{'lonSqlAccess'},{ RaiseError =>0,PrintError=>0})
) {	) {
print "Cannot connect to database!\n";	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 {	else {
$dbh->disconnect;	$dbh->disconnect;
Line 79 while ($configline=<CONFIG>) {	Line 85 while ($configline=<CONFIG>) {
}	}
close(CONFIG);	close(CONFIG);

	$PREFORK=int($PREFORK/4);

$unixsock = "mysqlsock";	$unixsock = "mysqlsock";
my $localfile="$perlvar{'lonSockDir'}/$unixsock";	my $localfile="$perlvar{'lonSockDir'}/$unixsock";
my $server;	my $server;
Line 295 sub make_new_child {	Line 303 sub make_new_child {
'creationdate','keywords','language',	'creationdate','keywords','language',
'lastrevisiondate','mime','notes',	'lastrevisiondate','mime','notes',
'owner','subject','title') {	'owner','subject','title') {
$stuff=~s/\n?\<$f[^\>]\>.?<\/$f[^\>]*\>\n?//;	$stuff=~s/\n?\<$f[^\>]\>.?<\/$f[^\>]*\>\n?//s;
}	}
my $m2=$m; my $docroot=$perlvar{'lonDocRoot'};	my $m2=$m; my $docroot=$perlvar{'lonDocRoot'};
$m2=~s/^$docroot//;	$m2=~s/^$docroot//;

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.35
changed lines
	Added in v.1.38