loncom/interface/lonsearchcat.pm - diff

Return to lonsearchcat.pm CVS log

Up to [LON-CAPA] / loncom / interface

version 1.82, 2001/03/27 13:25:41	version 1.84, 2001/03/27 19:05:02
Line 560 sub advancedsearch {	Line 560 sub advancedsearch {
$customquery=&build_custommetadata_query('custommetadata',	$customquery=&build_custommetadata_query('custommetadata',
$ENV{'form.custommetadata'});	$ENV{'form.custommetadata'});
}	}
	my $customshow='';
	if ($ENV{'form.customshow'}) {
	$customshow=$ENV{'form.customshow'};
	$customshow=~s/[^\w\s]//g;
	my @fields=split(/\s+/,$customshow);
	$customshow=join(" ",@fields);
	}
if (@queries) {	if (@queries) {
$query=join(" AND ",@queries);	$query=join(" AND ",@queries);
$query="select * from metadata where $query";	$query="select * from metadata where $query";
my $reply='';	my $reply='';
unless ($customquery) {	unless ($customquery or $customshow) {
$reply=&Apache::lonnet::metadata_query($query);	$reply=&Apache::lonnet::metadata_query($query);
}	}
else {	else {
$reply=&Apache::lonnet::metadata_query($query,$customquery);	$reply=&Apache::lonnet::metadata_query($query,
	$customquery,$customshow);
}	}
&output_results('Advanced',$r,$envhash,$customquery,$reply);	&output_results('Advanced',$r,$envhash,$customquery,$reply);
}	}
else {	else {
&output_results('Advanced',$r,$envhash,$query);	&output_results('Advanced',$r,$envhash,$query);
}	}
	$r->print(' ');
return OK;	return OK;
}	}