--- loncom/homework/caparesponse/caparesponse.pm 2007/02/18 02:03:18 1.208 +++ loncom/homework/caparesponse/caparesponse.pm 2007/04/26 23:15:43 1.213 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # caparesponse definition # -# $Id: caparesponse.pm,v 1.208 2007/02/18 02:03:18 albertel Exp $ +# $Id: caparesponse.pm,v 1.213 2007/04/26 23:15:43 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -465,7 +465,7 @@ sub add_in_tag_answer { my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval, $response_level); &Apache::lonxml::debug('answer is'.join(':',@answer)); - if (@answer && defined($answer[0])) { + if (@answer && $answer[0] =~ /\S/) { $answer{$tag_internal_answer_name}= {'type' => 'ordered', 'answers' => [\@answer] }; } @@ -601,6 +601,7 @@ sub end_numericalresponse { } } } + &Apache::response::setup_prior_tries_hash(\&format_prior_response_numerical); } elsif ($target eq 'edit') { $result.=''.&Apache::edit::end_table; } elsif ($target eq 'answer' || $target eq 'analyze') { @@ -791,6 +792,22 @@ sub end_numericalresponse { return $result; } +sub format_prior_response_numerical { + my ($mode,$answer) = @_; + if (ref($answer)) { + my $result = ''; + foreach my $element (@{ $answer }) { + $result.= ''; + } + $result.='
'. + &HTML::Entities::encode($element,'"<>&').'
'; + return $result; + } + return ''. + &HTML::Entities::encode($answer,'"<>&').''; + +} + sub check_for_answer_errors { my ($parstack,$safeeval) = @_; &add_in_tag_answer($parstack,$safeeval); @@ -1010,6 +1027,12 @@ sub get_sigrange { return ($sig_ubound,$sig_lbound); } +sub format_prior_response_string { + my ($mode,$answer) =@_; + return ''. + &HTML::Entities::encode($answer,'"<>&').''; +} + sub start_stringresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; @@ -1187,6 +1210,8 @@ sub end_stringresponse { } } elsif ($target eq 'edit') { $result.=''.&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' || $target eq 'tex' || $target eq 'analyze') {