loncom/homework/caparesponse/caparesponse.pm - diff

Return to caparesponse.pm CVS log

Up to [LON-CAPA] / loncom / homework / caparesponse

Diff for /loncom/homework/caparesponse/caparesponse.pm between versions 1.208 and 1.214

version 1.208, 2007/02/18 02:03:18	version 1.214, 2007/05/22 00:45:43
Line 465 sub add_in_tag_answer {	Line 465 sub add_in_tag_answer {
my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval,	my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval,
$response_level);	$response_level);
&Apache::lonxml::debug('answer is'.join(':',@answer));	&Apache::lonxml::debug('answer is'.join(':',@answer));
if (@answer && defined($answer[0])) {	if (@answer && $answer[0] =~ /\S/) {
$answer{$tag_internal_answer_name}= {'type' => 'ordered',	$answer{$tag_internal_answer_name}= {'type' => 'ordered',
'answers' => [\@answer] };	'answers' => [\@answer] };
}	}
Line 601 sub end_numericalresponse {	Line 601 sub end_numericalresponse {
}	}
}	}
}	}
	&Apache::response::setup_prior_tries_hash(\&format_prior_response_numerical);
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result.='</td></tr>'.&Apache::edit::end_table;	$result.='</td></tr>'.&Apache::edit::end_table;
} elsif ($target eq 'answer' \|\| $target eq 'analyze') {	} elsif ($target eq 'answer' \|\| $target eq 'analyze') {
Line 791 sub end_numericalresponse {	Line 792 sub end_numericalresponse {
return $result;	return $result;
}	}

	sub format_prior_response_numerical {
	my ($mode,$answer) = @_;
	if (ref($answer)) {
	my $result = '<table class="LC_prior_numerical"><tr>';
	foreach my $element (@{ $answer }) {
	$result.= '<td><span class="LC_prior_numerical">'.
	&HTML::Entities::encode($element,'"<>&').'</span></td>';
	}
	$result.='</tr></table>';
	return $result;
	}
	return '<span class="LC_prior_numerical">'.
	&HTML::Entities::encode($answer,'"<>&').'</span>';

	}

sub check_for_answer_errors {	sub check_for_answer_errors {
my ($parstack,$safeeval) = @_;	my ($parstack,$safeeval) = @_;
&add_in_tag_answer($parstack,$safeeval);	&add_in_tag_answer($parstack,$safeeval);
Line 810 sub check_for_answer_errors {	Line 827 sub check_for_answer_errors {
use Data::Dumper;	use Data::Dumper;
&Apache::lonxml::debug("count dump is ".&Dumper(\%counts));	&Apache::lonxml::debug("count dump is ".&Dumper(\%counts));
my $expected_number_of_inputs = (keys(%counts))[0];	my $expected_number_of_inputs = (keys(%counts))[0];
if ( $expected_number_of_inputs != scalar(@Apache::inputtags::inputlist)) {	if ( $expected_number_of_inputs > 0
	&& $expected_number_of_inputs != scalar(@Apache::inputtags::inputlist)) {
&Apache::lonxml::error(&mt("Expected [_1] input fields, but there were only [_2] seen.",	&Apache::lonxml::error(&mt("Expected [_1] input fields, but there were only [_2] seen.",
$expected_number_of_inputs,	$expected_number_of_inputs,
scalar(@Apache::inputtags::inputlist)));	scalar(@Apache::inputtags::inputlist)));
Line 1010 sub get_sigrange {	Line 1028 sub get_sigrange {
return ($sig_ubound,$sig_lbound);	return ($sig_ubound,$sig_lbound);
}	}

	sub format_prior_response_string {
	my ($mode,$answer) =@_;
	return '<span class="LC_prior_string">'.
	&HTML::Entities::encode($answer,'"<>&').'</span>';
	}

sub start_stringresponse {	sub start_stringresponse {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;	my $result;
Line 1187 sub end_stringresponse {	Line 1211 sub end_stringresponse {
}	}
} elsif ($target eq 'edit') {	} elsif ($target eq 'edit') {
$result.='</td></tr>'.&Apache::edit::end_table;	$result.='</td></tr>'.&Apache::edit::end_table;
	} elsif ($target eq 'web' \|\| $target eq 'tex') {
	&Apache::response::setup_prior_tries_hash(\&format_prior_response_string);
}	}
if ($target eq 'grade' \|\| $target eq 'web' \|\| $target eq 'answer' \|\|	if ($target eq 'grade' \|\| $target eq 'web' \|\| $target eq 'answer' \|\|
$target eq 'tex' \|\| $target eq 'analyze') {	$target eq 'tex' \|\| $target eq 'analyze') {

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

Removed from v.1.208
changed lines
	Added in v.1.214