loncom/homework/matchresponse.pm - diff

Return to matchresponse.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/matchresponse.pm between versions 1.47 and 1.50

version 1.47, 2004/10/21 06:35:57	version 1.50, 2005/01/31 22:00:40
Line 309 sub grade_response {	Line 309 sub grade_response {
$randomize,	$randomize,
&Apache::response::showallfoils(),	&Apache::response::showallfoils(),
\%Apache::response::foilgroup);	\%Apache::response::foilgroup);
if (!defined($ENV{'form.submitted'})) { return; }	if (!&Apache::response::submitted()) { return; }
my %responsehash;	my %responsehash;
my %grade;	my %grade;
my ($temp,$right,$wrong,$ignored)=(1,0,0,0);	my ($temp,$right,$wrong,$ignored)=(1,0,0,0);
Line 636 sub end_foil {	Line 636 sub end_foil {
if ($target eq 'web' \|\| $target eq 'tex' \|\| $target eq 'analyze') {	if ($target eq 'web' \|\| $target eq 'tex' \|\| $target eq 'analyze') {
$text=&Apache::lonxml::endredirection;	$text=&Apache::lonxml::endredirection;
}	}

if ($target eq 'web' \|\| $target eq 'grade' \|\| $target eq 'answer' \|\|	if ($target eq 'web' \|\| $target eq 'grade' \|\| $target eq 'answer' \|\|
$target eq 'tex' \|\| $target eq 'analyze') {	$target eq 'tex' \|\| $target eq 'analyze') {
	if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
	$text='\vskip 5mm $\triangleright$ '.$text;
	}
my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);	my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
if ($value ne 'unused') {	if ($value ne 'unused') {
my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);	my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
&Apache::lonxml::debug("Got a name of :$name:");	&Apache::lonxml::debug("Got a name of :$name:");
if (!$name) { $name=$Apache::lonxml::curdepth; }	if (!$name) {
	&Apache::lonxml::error("Foils without names exist. This can cause problems to malfunction.");
	$name=$Apache::lonxml::curdepth;
	}
&Apache::lonxml::debug("Using a name of :$name:");	&Apache::lonxml::debug("Using a name of :$name:");
if (defined($Apache::response::foilnames{$name})) {	if (defined($Apache::response::foilnames{$name})) {
&Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name));	&Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name));
Line 654 sub end_foil {	Line 661 sub end_foil {
&& !&Apache::response::showallfoils() ) {	&& !&Apache::response::showallfoils() ) {
push @{ $Apache::response::conceptgroup{'names'} }, $name;	push @{ $Apache::response::conceptgroup{'names'} }, $name;
$Apache::response::conceptgroup{"$name.value"} = $value;	$Apache::response::conceptgroup{"$name.value"} = $value;
if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {	$Apache::response::conceptgroup{"$name.text"} = $text;
$Apache::response::conceptgroup{"$name.text"} = ' $\triangleright$ '.$text;
} else {
$Apache::response::conceptgroup{"$name.text"} = $text;
}
$Apache::response::conceptgroup{"$name.location"} = $location;	$Apache::response::conceptgroup{"$name.location"} = $location;
} else {	} else {
push @{ $Apache::response::foilgroup{'names'} }, $name;	push @{ $Apache::response::foilgroup{'names'} }, $name;
$Apache::response::foilgroup{"$name.value"} = $value;	$Apache::response::foilgroup{"$name.value"} = $value;
if ($Apache::lonhomework::type eq 'exam') {	$Apache::response::foilgroup{"$name.text"} = $text;
if ($target eq 'tex') {
$Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;
} else {
$Apache::response::foilgroup{"$name.text"} = $text;
}
} else {
if ($target eq 'tex') {
$Apache::response::foilgroup{"$name.text"} = $text;
} else {
$Apache::response::foilgroup{"$name.text"} = $text;
}
}
$Apache::response::foilgroup{"$name.location"} = $location;	$Apache::response::foilgroup{"$name.location"} = $location;
}	}
}	}

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

Removed from v.1.47
changed lines
	Added in v.1.50