loncom/lonsql - diff

Return to lonsql CVS log

Up to [LON-CAPA] / loncom

version 1.10, 2001/03/22 19:25:52	version 1.18, 2001/03/27 02:09:50
Line 234 sub make_new_child {	Line 234 sub make_new_child {
else {	else {
my $r1=$sth->fetchall_arrayref;	my $r1=$sth->fetchall_arrayref;
my @r2; map {my $a=$_; my @b=map {escape($_)} @$a; push @r2,join(",", @b)} (@$r1);	my @r2; map {my $a=$_; my @b=map {escape($_)} @$a; push @r2,join(",", @b)} (@$r1);
$result=join("&",@r2) . "\n";	$result=join("&",@r2);
}	}

# do custom metadata searching here and build into result	# do custom metadata searching here and build into result
Line 248 sub make_new_child {	Line 248 sub make_new_child {
# if file is not in sql database, output error.	# if file is not in sql database, output error.
# if file is indicated in sql database and is	# if file is indicated in sql database and is
# part of query result list, then do the pattern match.	# part of query result list, then do the pattern match.
	my $customresult='';
	foreach my $m (@metalist) {
	my $fh=IO::File->new($m);
	my @lines=<$fh>;
	my $stuff=join('',@lines);
	if ($stuff=~/$custom/s) {
	foreach my $f ('abstract','author','copyright',
	'creationdate','keywords','language',
	'lastrevisiondate','mime','notes',
	'owner','subject','title') {
	$stuff=~s/\<$f[^\>]\>.?<\/$f[^\>]*\>//;
	}
	&logthis("found: $stuff");
	$customresult.='&custom='.escape($stuff);
	}
	}
	$result.=$customresult;
}	}
# reply with result	# reply with result
	$result.="\n" if $result;
&reply("queryreply:$queryid:$result",$conserver);	&reply("queryreply:$queryid:$result",$conserver);

}	}