--- loncom/homework/response.pm 2011/11/29 13:24:38 1.228 +++ loncom/homework/response.pm 2011/12/15 01:21:28 1.230 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # various response type definitons response definition # -# $Id: response.pm,v 1.228 2011/11/29 13:24:38 raeburn Exp $ +# $Id: response.pm,v 1.230 2011/12/15 01:21:28 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -491,7 +491,7 @@ sub end_customresponse { $result .= &Apache::response::answer_footer('customresponse'); } if ($target eq 'web') { - &setup_prior_tries_hash(\&format_prior_response_math); + &setup_prior_tries_hash(\&format_prior_response_custom); } if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') { @@ -512,6 +512,9 @@ sub end_customresponse { sub format_prior_response_custom { my ($mode,$answer) =@_; + if (ref($answer) eq 'ARRAY') { + $answer = '('.join(', ', @{ $answer }).')'; + } return ''. &HTML::Entities::encode($answer,'"<>&').''; } @@ -1186,8 +1189,8 @@ sub show_answer { my $status = $Apache::inputtags::status[-1]; my $canshow = 0; if ($award =~ /^correct/) { - if ((&Apache::inputtags::grading_is_nonlenient($part)) || - ($Apache::lonhomework::history{"resource.$part.awarded"} == 1)) { + if (($Apache::lonhomework::history{"resource.$part.awarded"} >= 1) || + (&Apache::lonnet::EXT("resource.$part.retrypartial") !~/^1|on|yes$/)) { $canshow = 1; } }