loncom/lond - diff

Return to lond CVS log

Up to [LON-CAPA] / loncom

Diff for /loncom/lond between versions 1.80 and 1.82

version 1.80, 2002/05/11 21:24:56	version 1.82, 2002/06/18 19:39:13
Line 105 sub timeout {	Line 105 sub timeout {
$SIG{'QUIT'}=\&catchexception;	$SIG{'QUIT'}=\&catchexception;
$SIG{__DIE__}=\&catchexception;	$SIG{__DIE__}=\&catchexception;

# ------------------------------------------- Read access.conf and loncapa.conf	# ---------------------------------- Read loncapa_apache.conf and loncapa.conf
&status("Read access.conf and loncapa.conf");	&status("Read loncapa_apache.conf and loncapa.conf");
my $perlvarref=LONCAPA::Configuration::read_conf('access.conf','loncapa.conf');	my $perlvarref=LONCAPA::Configuration::read_conf('loncapa_apache.conf',
	'loncapa.conf');
my %perlvar=%{$perlvarref};	my %perlvar=%{$perlvarref};
undef $perlvarref;	undef $perlvarref;

Line 1291 sub make_new_child {	Line 1292 sub make_new_child {
# ------------------------------------------------------------------- querysend	# ------------------------------------------------------------------- querysend
} elsif ($userinput =~ /^querysend/) {	} elsif ($userinput =~ /^querysend/) {
my ($cmd,$query,	my ($cmd,$query,
$custom,$customshow)=split(/:/,$userinput);	$arg1,$arg2,$arg3)=split(/\:/,$userinput);
$query=~s/\n*$//g;	$query=~s/\n*$//g;
unless ($custom or $customshow) {	print $client "".
print $client "".
sqlreply("$hostid{$clientip}\&$query")."\n";
}
else {
print $client "".
sqlreply("$hostid{$clientip}\&$query".	sqlreply("$hostid{$clientip}\&$query".
"\&$custom"."\&$customshow")."\n";	"\&$arg1"."\&$arg2"."\&$arg3")."\n";
}
# ------------------------------------------------------------------ queryreply	# ------------------------------------------------------------------ queryreply
} elsif ($userinput =~ /^queryreply/) {	} elsif ($userinput =~ /^queryreply/) {
my ($cmd,$id,$reply)=split(/:/,$userinput);	my ($cmd,$id,$reply)=split(/:/,$userinput);

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

Removed from v.1.80
changed lines
	Added in v.1.82