--- loncom/homework/response.pm 2011/11/29 18:44:31 1.221.2.2 +++ loncom/homework/response.pm 2011/03/07 19:42:21 1.222 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # various response type definitons response definition # -# $Id: response.pm,v 1.221.2.2 2011/11/29 18:44:31 raeburn Exp $ +# $Id: response.pm,v 1.222 2011/03/07 19:42:21 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -321,7 +321,7 @@ sub check_for_previous { next if (($questiontype eq 'randomizetry') && ($curr_rndseed ne $Apache::lonhomework::history{"$history:resource.$partid.rndseed"})); push (@{$previous{'versionci'}},$history); - $previous{'awardci'} = $Apache::lonhomework::history{"$history:resource.$partid.$id.awarddetail"}; + $previous{'awardci'} = $Apache::lonhomework::history{"resource.$partid.$id.awarddetail"}; $previous{'usedci'} = 1; } } @@ -489,7 +489,7 @@ sub end_customresponse { $result .= &Apache::response::answer_footer('customresponse'); } if ($target eq 'web') { - &setup_prior_tries_hash(\&format_prior_response_custom); + &setup_prior_tries_hash(\&format_prior_response_math); } if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') { @@ -510,9 +510,6 @@ sub end_customresponse { sub format_prior_response_custom { my ($mode,$answer) =@_; - if (ref($answer) eq 'ARRAY') { - $answer = '('.join(', ', @{ $answer }).')'; - } return ''. &HTML::Entities::encode($answer,'"<>&').''; } @@ -1143,9 +1140,9 @@ sub whichorder { sub show_answer { my $part = $Apache::inputtags::part; - my $award = $Apache::lonhomework::history{"resource.$part.solved"}; + my $award = $Apache::lonhomework::history{"resource.$part.awarded"}; my $status = $Apache::inputtags::status[-1]; - return ( ($award =~ /^correct/ + return ( ($award ==1 && &Apache::lonhomework::show_problem_status()) || $status eq "SHOW_ANSWER"); }