--- loncom/homework/response.pm 2011/11/29 18:44:31 1.221.2.2 +++ loncom/homework/response.pm 2011/09/08 01:18:15 1.225 @@ -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.225 2011/09/08 01:18:15 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -179,7 +179,7 @@ sub setrandomnumber { } else { ($rndmod,$rndmod2)=&Apache::lonnet::digest("$id1,$id2"); } - + $Apache::lonhomework::results{'resource.'.$id1.'.rawrndseed'}=$rndseed; if ($rndseed =~/([,:])/) { my $char=$1; use integer; @@ -196,6 +196,7 @@ sub setrandomnumber { } } &Apache::lonxml::debug("randseed $rndmod $rndseed"); + $Apache::lonhomework::results{'resource.'.$id1.'.rndseed'}=$rndseed; &Apache::lonnet::setup_random_from_rndseed($rndseed); return ''; } @@ -489,7 +490,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 +511,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 +1141,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"); }