--- loncom/homework/caparesponse/caparesponse.pm 2003/05/13 15:27:45 1.98 +++ loncom/homework/caparesponse/caparesponse.pm 2003/10/23 19:36:02 1.107.2.4 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # caparesponse definition # -# $Id: caparesponse.pm,v 1.98 2003/05/13 15:27:45 sakharuk Exp $ +# $Id: caparesponse.pm,v 1.107.2.4 2003/10/23 19:36:02 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -114,7 +114,6 @@ sub end_numericalresponse { if ( $response =~ /[^\s]/) { my $ad; my %previous = &Apache::response::check_for_previous($response,$partid,$id); - $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response; &Apache::lonxml::debug("submitted a $response
\n"); &Apache::lonxml::debug($$parstack[-1] . "\n
"); @@ -131,6 +130,7 @@ sub end_numericalresponse { $response =~ s/\\/\\\\/g; $response =~ s/\'/\\\'/g; } + $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response; &Apache::lonxml::debug("current $response"); my $expression="&caparesponse_check_list('".$response."','". $$parstack[-1]; @@ -150,6 +150,10 @@ sub end_numericalresponse { $expression.=';my $type="float";'; } $expression.="');"; + my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval); + &Apache::lonxml::debug('answer is'.join(':',@answer)); + @{$safeeval->varglob('CAPARESPONSE_CHECK_LIST_answer')}=@answer; + $result = &Apache::run::run($expression,$safeeval); my ($awards) = split /:/ , $result; ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards); @@ -165,10 +169,7 @@ sub end_numericalresponse { $safeeval); my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; my $status = $Apache::inputtags::status['-1']; - if ( ($award =~ /^correct/ - && lc($Apache::lonhomework::problemstatus) ne 'no') - || $status eq "SHOW_ANSWER" - || $ENV{'form.texaward'} eq 'SHOW_ANSWER') { + if ( &Apache::response::show_answer() ) { my (@formats)=&Apache::lonxml::get_param_var('format',$parstack, $safeeval); my $unit=&Apache::lonxml::get_param_var('unit',$parstack, @@ -230,11 +231,16 @@ sub end_numericalresponse { if ($$tagstack[-1] eq 'numericalresponse') { if ($unit=~/\S/) {$result.=' (in '.$unit.')

';} $result.= ''; + my $previous=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.$id.submission"}; for (my $ind=0;$ind<$number_of_bubbles;$ind++) { + my $checked=''; + if ($previous eq $bubble_values[$ind]) { + $checked=" checked='on' "; + } $result.=''; + '" value="'.$bubble_values[$ind].'" '.$checked + .' />'.$alphabet[$ind].': '. + $bubble_values[$ind].''; } $result.='
'. - $alphabet[$ind].': '. - $bubble_values[$ind].'
'; } elsif ($$tagstack[-1] eq 'formularesponse') { @@ -243,7 +249,7 @@ sub end_numericalresponse {

'; } } elsif ($target eq 'tex') { - if (defined $unit and $Apache::lonhomework::type eq 'exam') { + if ((defined $unit) and ($unit=~/\S/) and ($Apache::lonhomework::type eq 'exam')) { $result.=' \textit{(in} \verb|'.$unit.'|\textit{)} '; } if ($$tagstack[-1] eq 'numericalresponse') { @@ -309,7 +315,7 @@ sub end_numericalresponse { if ($Apache::inputtags::params{'sig'}) { ($sighigh,$siglow)=&get_sigrange($Apache::inputtags::params{'sig'}); } - if ($fmt) { + if ($fmt && $$tagstack[-1] eq 'numericalresponse') { $ans = sprintf('%.'.$fmt,$ans); if ($high) { $high=sprintf('%.'.$fmt,$high); @@ -317,12 +323,12 @@ sub end_numericalresponse { } } if ($target eq 'answer') { - if ($high) { $ans.=' ['.$low.','.$high.']'; } - if ($sighigh) { - if ($ENV{'form.print_answer'} eq 'yes') { - $ans.= " Sig \\textit{$siglow - $sighigh}"; + if ($high && $$tagstack[-1] eq 'numericalresponse') { $ans.=' ['.$low.','.$high.']'; } + if ($sighigh && $$tagstack[-1] eq 'numericalresponse') { + if ($ENV{'form.answer_output_mode'} eq 'tex') { + $ans.= " Sig $siglow - $sighigh"; } else { - $ans.= " Sig $siglow - $sighigh"; + $ans.= " Sig $siglow - $sighigh"; } } $result.=&Apache::response::answer_part($$tagstack[-1],$ans); @@ -334,21 +340,21 @@ sub end_numericalresponse { } } } - if ($unit) { + if (defined($unit) and ($unit ne '') and + $$tagstack[-1] eq 'numericalresponse') { if ($target eq 'answer') { - if ($ENV{'form.print_answer'} eq 'yes') { + if ($ENV{'form.answer_output_mode'} eq 'tex') { $result.=&Apache::response::answer_part($$tagstack[-1], - "Unit: \\verb|$unit|"); + " Unit: $unit "); } else { $result.=&Apache::response::answer_part($$tagstack[-1], "Unit: $unit"); } } elsif ($target eq 'analyze') { - push (@{ $Apache::lonhomework::analyze{"$part_id.unit"} }, - $unit); + push (@{ $Apache::lonhomework::analyze{"$part_id.unit"} }, $unit); } } - if ($type || $token->[1] eq 'stringresponse') { + if ($type || $$tagstack[-1] eq 'stringresponse') { my $string='Case Insensitive'; if ($type eq 'mc') { $string='Multiple Choice'; @@ -360,10 +366,15 @@ sub end_numericalresponse { $string='Formula'; } if ($target eq 'answer') { - $result.=&Apache::response::answer_part($$tagstack[-1], - ''.$string.''); + if ($ENV{'form.answer_output_mode'} eq 'tex') { + $result.=&Apache::response::answer_part($$tagstack[-1], + "\\textbf{$string}"); + } else { + $result.=&Apache::response::answer_part($$tagstack[-1], + "$string"); + } } elsif ($target eq 'analyze') { - push (@{ $Apache::lonhomework::analyze{"$part_id.type"} }, + push (@{ $Apache::lonhomework::analyze{"$part_id.str_type"} }, $type); } } @@ -434,6 +445,7 @@ sub format_number { sub make_numerical_bubbles { my ($number_of_bubbles,$target,$answer,$format) =@_; + my @oldseed=&Math::Random::random_get_seed(); my @bubble_values = (); my @factors = (1.13,1.17,1.25,1.33,1.45); #default values of factors my @powers = (1.0,2.0,3.0,4.0,5.0,6.0,7.0,8.0); #default values for powers @@ -448,6 +460,7 @@ sub make_numerical_bubbles { $format,$target); } + &Math::Random::random_set_seed(@oldseed); return @bubble_values; } @@ -489,7 +502,9 @@ sub start_stringresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; if ($target eq 'meta') { + &Apache::response::start_response($parstack,$safeeval); $result=&Apache::response::meta_package_write('stringresponse'); + &Apache::response::end_response(); } else { $result.=&start_numericalresponse(@_); } @@ -504,7 +519,9 @@ sub start_formularesponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; if ($target eq 'meta') { + &Apache::response::start_response($parstack,$safeeval); $result=&Apache::response::meta_package_write('formularesponse'); + &Apache::response::end_response(); } else { $result.=&start_numericalresponse(@_); }