loncom/lonsql - diff

Return to lonsql CVS log

Up to [LON-CAPA] / loncom

Diff for /loncom/lonsql between versions 1.34 and 1.39

version 1.34, 2001/04/16 18:51:22	version 1.39, 2001/11/29 13:53:56
Line 1	Line 1
#!/usr/bin/perl	#!/usr/bin/perl

	# The LearningOnline Network
	# lonsql - LON TCP-MySQL-Server
	#
	# YEAR=2000
# lonsql-based on the preforker:harsha jagasia:date:5/10/00	# lonsql-based on the preforker:harsha jagasia:date:5/10/00
# 7/25 Gerd Kortemeyer	# 7/25 Gerd Kortemeyer
# many different dates Scott Harrison	# many different dates Scott Harrison
	# YEAR=2001
	# many different dates Scott Harrison
# 03/22/2001 Scott Harrison	# 03/22/2001 Scott Harrison
	# 8/30 Gerd Kortemeyer
	# 10/17,11/28,11/29 Scott Harrison
	#
	# $Id$
	###


use IO::Socket;	use IO::Socket;
use Symbol;	use Symbol;
use POSIX;	use POSIX;
Line 45 close(CONFIG);	Line 59 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 97 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 315 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//;
$m2=~s/\.meta$//;	$m2=~s/\.meta$//;
unless ($query) {	unless ($query) {
my $q2="select * from metadata where url like '$m2'";	my $q2="select * from metadata where url like binary '$m2'";
my $sth = $dbh->prepare($q2);	my $sth = $dbh->prepare($q2);
$sth->execute();	$sth->execute();
my $r1=$sth->fetchall_arrayref;	my $r1=$sth->fetchall_arrayref;

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

Removed from v.1.34
changed lines
	Added in v.1.39