loncom/lonsql - diff

Return to lonsql CVS log

Up to [LON-CAPA] / loncom

version 1.72, 2006/02/07 22:30:31	version 1.74, 2006/02/08 21:17:53
Line 388 sub make_new_child {	Line 388 sub make_new_child {
$run = $run+1;	$run = $run+1;
my $userinput = <$client>;	my $userinput = <$client>;
chomp($userinput);	chomp($userinput);
	$userinput=~s/\:(\w+)$//;
	my $searchdomain=$1;
#	#
my ($conserver,$query,	my ($conserver,$query,
$arg1,$arg2,$arg3)=split(/&/,$userinput);	$arg1,$arg2,$arg3)=split(/&/,$userinput);
Line 464 sub make_new_child {	Line 466 sub make_new_child {
}	}
} else {	} else {
# Do an sql query	# Do an sql query
$result = &do_sql_query($query,$arg1,$arg2);	$result = &do_sql_query($query,$arg1,$arg2,$searchdomain);
}	}
# result does not need to be escaped because it has already been	# result does not need to be escaped because it has already been
# escaped.	# escaped.
Line 515 sub process_file {	Line 517 sub process_file {
}	}

sub do_sql_query {	sub do_sql_query {
my ($query,$custom,$customshow) = @_;	my ($query,$custom,$customshow,$searchdomain) = @_;
# &logthis('doing query '.$query);
	#
	# limit to searchdomain if given and table is metadata
	#
	if (($searchdomain) && ($query=~/FROM metadata/)) {
	$query.=' HAVING (domain="'.$searchdomain.'")';
	}
	# &logthis('doing query ('.$searchdomain.')'.$query);



$custom = &unescape($custom);	$custom = &unescape($custom);
$customshow = &unescape($customshow);	$customshow = &unescape($customshow);
#	#