--- loncom/homework/caparesponse/caparesponse.pm 2006/03/09 00:41:13 1.188 +++ loncom/homework/caparesponse/caparesponse.pm 2007/03/01 02:31:29 1.209 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # caparesponse definition # -# $Id: caparesponse.pm,v 1.188 2006/03/09 00:41:13 albertel Exp $ +# $Id: caparesponse.pm,v 1.209 2007/03/01 02:31:29 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -29,15 +29,26 @@ package Apache::caparesponse; use strict; use capa; +use Safe::Hole; +use Apache::lonmaxima(); use Apache::lonlocal; use Apache::lonnet; +use Apache::response(); +use Storable qw(dclone); BEGIN { - &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse','stringresponse','formularesponse')); + &Apache::lonxml::register('Apache::caparesponse',('numericalresponse','stringresponse','formularesponse')); } my %answer; +my @answers; +sub get_answer { return %answer; }; +sub push_answer{ push(@answers,dclone(\%answer)); undef(%answer) } +sub pop_answer { %answer = %{pop(@answers)}; }; + my $cur_name; +my $tag_internal_answer_name = 'INTERNAL'; + sub start_answer { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result; @@ -50,31 +61,92 @@ sub start_answer { if (!defined($type)) { $type = 'ordered' }; $answer{$cur_name}= { 'type' => $type, 'answers' => [] }; + if ($target eq 'edit') { + $result.=&Apache::edit::tag_start($target,$token); + $result.=&Apache::edit::text_arg('Name:','name',$token); + $result.=&Apache::edit::select_arg('Type:','type', + [['ordered', 'Ordered' ], + ['unordered','Unordered'],], + $token); + $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); + } elsif ($target eq 'modified') { + my $constructtag = &Apache::edit::get_new_args($token,$parstack, + $safeeval,'name', + 'type'); + if ($constructtag) { + $result = &Apache::edit::rebuild_tag($token); + $result.= &Apache::edit::handle_insert(); + } + } return $result; } sub end_answer { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result; + if ($target eq 'edit') { + $result .= &Apache::edit::tag_end(); + } + undef($cur_name); return $result; } +sub insert_answer { + return ' + + + '; +} + sub start_answergroup { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result; - my $id = $Apache::inputtags::response[-1]; - my $dis = &Apache::lonxml::get_param('answerdisplay',$parstack,$safeeval); - if (defined($dis)) { $Apache::inputtags::answertxt{$id}=$dis; } + if ($target eq 'edit') { + $result.=&Apache::edit::tag_start($target,$token); + $result.=&Apache::edit::select_arg('Type:','type', + [['ordered', 'Ordered' ], + ['unordered','Unordered'],], + $token); + $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); + } elsif ($target eq 'modified') { + my $constructtag = &Apache::edit::get_new_args($token,$parstack, + $safeeval,'name', + 'type'); + if ($constructtag) { + $result = &Apache::edit::rebuild_tag($token); + $result.= &Apache::edit::handle_insert(); + } + } return $result; } sub end_answergroup { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result; + if ($target eq 'web') { + if ( &Apache::response::show_answer() ) { + my $partid = $Apache::inputtags::part; + my $id = $Apache::inputtags::response[-1]; + &set_answertext($Apache::lonhomework::history{"resource.$partid.$id.answername"}, + $target,$token,$tagstack,$parstack,$parser, + $safeeval,-2); + } + } elsif ($target eq 'edit') { + $result .= &Apache::edit::tag_end(); + } return $result; } +sub insert_answergroup { + return ' + + + + + '; +} + sub start_value { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; @@ -84,7 +156,16 @@ sub start_value { my $bodytext = &Apache::lonxml::get_all_text("/value",$parser,$style); $bodytext = &Apache::run::evaluate($bodytext,$safeeval, $$parstack[-1]); - push(@{ $answer{$cur_name}{'answers'} },$bodytext); + + push(@{ $answer{$cur_name}{'answers'} },[$bodytext]); + + } elsif ($target eq 'edit') { + $result.=&Apache::edit::tag_start($target,$token); + my $bodytext = &Apache::lonxml::get_all_text("/value",$parser,$style); + $result.=&Apache::edit::editline($token->[1],$bodytext,undef,40). + &Apache::edit::end_row(); + } elsif ($target eq 'modified') { + $result=$token->[4].&Apache::edit::modifiedfield('/value',$parser); } return $result; } @@ -92,9 +173,54 @@ sub start_value { sub end_value { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result; + if ($target eq 'edit') { + $result = &Apache::edit::end_table(); + } return $result; } +sub insert_value { + return ' + '; +} + +sub start_vector { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result; + if ( $target eq 'web' || $target eq 'tex' || + $target eq 'grade' || $target eq 'webgrade' || + $target eq 'answer' || $target eq 'analyze' ) { + my $bodytext = &Apache::lonxml::get_all_text("/vector",$parser,$style); + my @values = &Apache::run::run($bodytext,$safeeval,$$parstack[-1]); + if (@values == 1) { + @values = split(',',$values[0]); + } + push(@{ $answer{$cur_name}{'answers'} },\@values); + } elsif ($target eq 'edit') { + $result.=&Apache::edit::tag_start($target,$token); + my $bodytext = &Apache::lonxml::get_all_text("/vector",$parser,$style); + $result.=&Apache::edit::editline($token->[1],$bodytext,undef,40). + &Apache::edit::end_row(); + } elsif ($target eq 'modified') { + $result=$token->[4].&Apache::edit::modifiedfield('/vector',$parser); + } + return $result; +} + +sub end_vector { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $result; + if ($target eq 'edit') { + $result = &Apache::edit::end_table(); + } + return $result; +} + +sub insert_vector { + return ' + '; +} + sub start_array { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; @@ -129,7 +255,10 @@ sub end_unit { sub start_numericalresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - &Apache::lonxml::register('Apache::caparesponse',('answer','answergroup','value','array','unit')); + &Apache::lonxml::register('Apache::caparesponse', + ('answer','answergroup','value','array','unit', + 'vector')); + push(@Apache::lonxml::namespace,'caparesponse'); my $id = &Apache::response::start_response($parstack,$safeeval); my $result; undef(%answer); @@ -182,58 +311,105 @@ sub start_numericalresponse { if ($unit =~ /\S/) { $result.=" (in $unit) "; } } if ( &Apache::response::show_answer() ) { - my $answertxt; - my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack, - $safeeval); - my (@formats)=&Apache::lonxml::get_param_var('format',$parstack, - $safeeval); - my $unit=&Apache::lonxml::get_param_var('unit',$parstack, - $safeeval); - for (my $i=0; $i <= $#answers; $i++) { - my $answer=$answers[$i]; - if ( scalar(@$tagstack) - && $tagstack->[-1] ne 'numericalresponse') { - $answertxt.=$answer.','; + &set_answertext($tag_internal_answer_name,$target,$token,$tagstack, + $parstack,$parser,$safeeval,-1); + } + } + return $result; +} + +sub set_answertext { + my ($name,$target,$token,$tagstack,$parstack,$parser,$safeeval, + $response_level) = @_; + &add_in_tag_answer($parstack,$safeeval,$response_level); + + if ($name eq '' || !ref($answer{$name})) { + if (ref($answer{$tag_internal_answer_name})) { + $name = $tag_internal_answer_name; + } else { + $name = (sort(keys(%answer)))[0]; + } + } + return if ($name eq '' || !ref($answer{$name})); + + my (@formats)=&Apache::lonxml::get_param_var('format',$parstack, + $safeeval,$response_level); + my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval, + $response_level); + + &Apache::lonxml::debug("answer looks to be $name"); + my @answertxt; + for (my $i=0; $i < scalar(@{$answer{$name}{'answers'}}); $i++) { + my $answertxt; + my $answer=$answer{$name}{'answers'}[$i]; + foreach my $element (@$answer) { + if ( scalar(@$tagstack) + && $tagstack->[$response_level] ne 'numericalresponse') { + $answertxt.=$element.','; + } else { + my $format; + if ($#formats > 0) { + $format=$formats[$i]; } else { - my $format; - if ($#formats > 0) { - $format=$formats[$i]; - } else { - $format=$formats[0]; - } - if ($unit=~/\$/) { $format="\$".$format; $unit=~s/\$//g; } - if ($unit=~/\,/) { $format="\,".$format; $unit=~s/\,//g; } - my $formatted=&format_number($answer,$format,$target, - $safeeval); - $answertxt.=$formatted.','; + $format=$formats[0]; } + if ($unit=~/\$/) { $format="\$".$format; $unit=~s/\$//g; } + if ($unit=~/\,/) { $format="\,".$format; $unit=~s/\,//g; } + my $formatted=&format_number($element,$format,$target, + $safeeval); + $answertxt.=' '.$formatted.','; } - chop $answertxt; - if ($target eq 'web') { - $answertxt.=" $unit "; - } - $Apache::inputtags::answertxt{$id}=$answertxt; + } + chop($answertxt); + if ($target eq 'web') { + $answertxt.=" $unit "; + } + + push(@answertxt,$answertxt) } - return $result; + + my $id = $Apache::inputtags::response[-1]; + $Apache::inputtags::answertxt{$id}=\@answertxt; } -sub check_submission { - my ($response,$partid,$id,$tag,$parstack,$safeeval,$ignore_sig)=@_; +sub setup_capa_args { + my ($safeeval,$parstack,$args,$response) = @_; my $args_ref= \%{$safeeval->varglob('LONCAPA::CAPAresponse_args')}; - $$args_ref{'response'}=$response; - my $hideunit=&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffunit'); - - foreach my $arg ('type','tol','sig','format','unit','calc', - 'samples') { + undef(%{ $args_ref }); + + foreach my $arg (@{$args}) { $$args_ref{$arg}= &Apache::lonxml::get_param($arg,$parstack,$safeeval); } foreach my $key (keys(%Apache::inputtags::params)) { $$args_ref{$key}=$Apache::inputtags::params{$key}; } + &setup_capa_response($args_ref,$response); + return $args_ref; +} + +sub setup_capa_response { + my ($args_ref,$response) = @_; + + use Data::Dumper; + &Apache::lonxml::debug("response dump is ".&Dumper($response)); - #no way to enter units, with radio buttons + if (ref($response)) { + $$args_ref{'response'}=dclone($response); + } else { + $$args_ref{'response'}=dclone([$response]); + } +} + +sub check_submission { + my ($response,$partid,$id,$tag,$parstack,$safeeval,$ignore_sig)=@_; + my @args = ('type','tol','sig','format','unit','calc','samples'); + my $args_ref = &setup_capa_args($safeeval,$parstack,\@args,$response); + + my $hideunit= + &Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffunit'); + #no way to enter units, with radio buttons if ($Apache::lonhomework::type eq 'exam' || lc($hideunit) eq "yes") { delete($$args_ref{'unit'}); @@ -247,29 +423,32 @@ sub check_submission { } if ($tag eq 'formularesponse') { - $$args_ref{'type'}='fml'; + if ($$args_ref{'samples'}) { + $$args_ref{'type'}='fml'; + } else { + $$args_ref{'type'}='math'; + } } elsif ($tag eq 'numericalresponse') { $$args_ref{'type'}='float'; } - my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval); - &Apache::lonxml::debug('answer is'.join(':',@answer)); - if (@answer && defined($answer[0])) { - $answer{'INTERNAL'}= {'type' => 'ordered', - 'answers' => \@answer }; - } - #FIXME would be nice if we could save name so we know who graded him - #correct - my (%results,@final_awards,@final_msgs,@names); + + &add_in_tag_answer($parstack,$safeeval); + + my (@final_awards,@final_msgs,@names); foreach my $name (keys(%answer)) { &Apache::lonxml::debug(" doing $name with ".join(':',@{ $answer{$name}{'answers'} })); - @{$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=@{ $answer{$name}{'answers'} }; + + ${$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=dclone($answer{$name}); + &setup_capa_response($args_ref,$response); + use Time::HiRes; + my $t0 = [Time::HiRes::gettimeofday()]; my ($result,@msgs) = &Apache::run::run("&caparesponse_check_list()",$safeeval); + &Apache::lonxml::debug("checking $name $result with $response took ".&Time::HiRes::tv_interval($t0)); &Apache::lonxml::debug('msgs are '.join(':',@msgs)); my ($awards)=split(/:/,$result); my @awards= split(/,/,$awards); my ($ad, $msg) = &Apache::inputtags::finalizeawards(\@awards,\@msgs); - $results{$name}= [$ad,$msg]; push(@final_awards,$ad); push(@final_msgs,$msg); push(@names,$name); @@ -277,11 +456,34 @@ sub check_submission { my ($ad, $msg, $name) = &Apache::inputtags::finalizeawards(\@final_awards, \@final_msgs, \@names,1); - return($ad,$msg); + &Apache::lonxml::debug(" name of picked award is $name from ".join(', ',@names)); + return($ad,$msg, $name); +} + +sub add_in_tag_answer { + my ($parstack,$safeeval,$response_level) = @_; + my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval, + $response_level); + &Apache::lonxml::debug('answer is'.join(':',@answer)); + if (@answer && defined($answer[0])) { + $answer{$tag_internal_answer_name}= {'type' => 'ordered', + 'answers' => [\@answer] }; + } +} + +sub capa_formula_fix { + my ($expression)=@_; + return &Apache::response::implicit_multiplication($expression); } sub end_numericalresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + + &Apache::lonxml::deregister('Apache::caparesponse', + ('answer','answergroup','value','array','unit', + 'vector')); + pop(@Apache::lonxml::namespace); + my $increment=1; my $result = ''; if (!$Apache::lonxml::default_homework_loaded) { @@ -290,12 +492,14 @@ sub end_numericalresponse { my $partid = $Apache::inputtags::part; my $id = $Apache::inputtags::response[-1]; my $tag; + my $safehole = new Safe::Hole; $safeeval->share_from('capa',['&caparesponse_capa_check_answer']); + if (scalar(@$tagstack)) { $tag=$$tagstack[-1]; } if ( $target eq 'grade' && &Apache::response::submitted() ) { &Apache::response::setup_params($tag,$safeeval); if ($Apache::lonhomework::type eq 'exam' && - $tag eq 'formularesponse') { + (($tag eq 'formularesponse') || ($tag eq 'mathresponse'))) { $increment=&Apache::response::scored_response($partid,$id); } else { my $response = &Apache::response::getresponse(); @@ -305,13 +509,15 @@ sub end_numericalresponse { &Apache::lonxml::debug($$parstack[-1] . "\n
"); if ( &Apache::response::submitted('scantron')) { + &add_in_tag_answer($parstack,$safeeval); my ($values,$display)=&make_numerical_bubbles($partid,$id, $target,$parstack,$safeeval); $response=$values->[$response]; } $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response; - my ($ad,$msg)=&check_submission($response,$partid,$id, - $tag,$parstack,$safeeval); + my ($ad,$msg,$name)=&check_submission($response,$partid,$id, + $tag,$parstack, + $safeeval); &Apache::lonxml::debug('ad is'.$ad); if ($ad eq 'SIG_FAIL') { @@ -330,15 +536,17 @@ sub end_numericalresponse { &Apache::response::handle_previous(\%previous,$ad); $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad; $Apache::lonhomework::results{"resource.$partid.$id.awardmsg"}=$msg; + $Apache::lonhomework::results{"resource.$partid.$id.answername"}=$name; $result=''; } } } elsif ($target eq 'web' || $target eq 'tex') { - my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack, - $safeeval); + &check_for_answer_errors($parstack,$safeeval); my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; my $status = $Apache::inputtags::status['-1']; if ($Apache::lonhomework::type eq 'exam') { + # FIXME support multi dimensional numerical problems + # in exam bubbles my ($bubble_values,$bubble_display)= &make_numerical_bubbles($partid,$id,$target,$parstack, $safeeval); @@ -393,6 +601,7 @@ sub end_numericalresponse { } } } + &setup_prior_tries_hash(); } elsif ($target eq 'edit') { $result.=''.&Apache::edit::end_table; } elsif ($target eq 'answer' || $target eq 'analyze') { @@ -409,13 +618,14 @@ sub end_numericalresponse { if (scalar(@$tagstack)) { &Apache::response::setup_params($tag,$safeeval); } - my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval); + &add_in_tag_answer($parstack,$safeeval); my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval); + my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval); - my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval); if ($target eq 'answer') { - $result.=&Apache::response::answer_header($tag); + $result.=&Apache::response::answer_header($tag,undef, + scalar(keys(%answer))); if ($tag eq 'numericalresponse' && $Apache::lonhomework::type eq 'exam') { my ($bubble_values,undef,$correct) = &make_numerical_bubbles($partid, @@ -423,121 +633,152 @@ sub end_numericalresponse { $result.=&Apache::response::answer_part($tag,$correct); } } - my ($sigline,$tolline); - for(my $i=0;$i<=$#answers;$i++) { - my $ans=$answers[$i]; - my $fmt=$formats[0]; - if (@formats && $#formats) {$fmt=$formats[$i];} - my ($high,$low); - if ($Apache::inputtags::params{'tol'}) { - ($high,$low)=&get_tolrange($ans,$Apache::inputtags::params{'tol'}); - } - my ($sighigh,$siglow); - if ($Apache::inputtags::params{'sig'}) { - ($sighigh,$siglow)=&get_sigrange($Apache::inputtags::params{'sig'}); - } - if ($fmt && $tag eq 'numericalresponse') { - $fmt=~s/e/E/g; - if ($unit=~/\$/) { $fmt="\$".$fmt; $unit=~s/\$//g; } - if ($unit=~/\,/) { $fmt="\,".$fmt; $unit=~s/\,//g; } - $ans = &format_number($ans,$fmt,$target,$safeeval); - #if ($high) { - # $high=&format_number($high,$fmt,$target,$safeeval); - # $low =&format_number($low,$fmt,$target,$safeeval); - #} - } - if ($target eq 'answer') { - if ($high && $tag eq 'numericalresponse') { - $ans.=' ['.$low.','.$high.']'; - $tolline .= "[$low, $high]"; + foreach my $name (sort(keys(%answer))) { + my @answers = @{ $answer{$name}{'answers'} }; + if ($target eq 'analyze') { + foreach my $info ('answer','ans_high','ans_low','format') { + $Apache::lonhomework::analyze{"$part_id.$info"}{$name}=[]; } - if (defined($sighigh) && $tag eq 'numericalresponse') { - if ($env{'form.answer_output_mode'} eq 'tex') { - $ans.= " Sig $siglow - $sighigh"; - } else { - $ans.= " Sig $siglow - $sighigh"; - $sigline .= "[$siglow, $sighigh]"; + } + my ($sigline,$tolline); + if ($name ne $tag_internal_answer_name + || scalar(keys(%answer)) > 1) { + $result.=&Apache::response::answer_part($tag,$name); + } + for(my $i=0;$i<=$#answers;$i++) { + my $ans=$answers[$i]; + my $fmt=$formats[0]; + if (@formats && $#formats) {$fmt=$formats[$i];} + my ($sighigh,$siglow); + if ($Apache::inputtags::params{'sig'}) { + ($sighigh,$siglow)=&get_sigrange($Apache::inputtags::params{'sig'}); + } + my @vector; + if (ref($ans)) { + @vector = @{ $ans }; + } else { + @vector = ($ans); + } + my @all_answer_info; + foreach my $element (@vector) { + my ($high,$low); + if ($Apache::inputtags::params{'tol'}) { + ($high,$low)=&get_tolrange($element,$Apache::inputtags::params{'tol'}); + } + if ($target eq 'answer') { + if ($fmt && $tag eq 'numericalresponse') { + $fmt=~s/e/E/g; + if ($unit=~/\$/) { $fmt="\$".$fmt; $unit=~s/\$//g; } + if ($unit=~/\,/) { $fmt="\,".$fmt; $unit=~s/\,//g; } + $element = &format_number($element,$fmt,$target,$safeeval); + #if ($high) { + # $high=&format_number($high,$fmt,$target,$safeeval); + # $low =&format_number($low,$fmt,$target,$safeeval); + #} + } + if ($high && $tag eq 'numericalresponse') { + $element.=' ['.$low.','.$high.']'; + $tolline .= "[$low, $high]"; + } + if (defined($sighigh) && $tag eq 'numericalresponse') { + if ($env{'form.answer_output_mode'} eq 'tex') { + $element.= " Sig $siglow - $sighigh"; + } else { + $element.= " Sig $siglow - $sighigh"; + $sigline .= "[$siglow, $sighigh]"; + } + } + push(@all_answer_info,$element); + + } elsif ($target eq 'analyze') { + push (@{ $Apache::lonhomework::analyze{"$part_id.answer"}{$name}[$i] }, $element); + if ($high) { + push (@{ $Apache::lonhomework::analyze{"$part_id.ans_high"}{$name}[$i] }, $high); + push (@{ $Apache::lonhomework::analyze{"$part_id.ans_low"}{$name}[$i] }, $low); + } + if ($fmt) { + push (@{ $Apache::lonhomework::analyze{"$part_id.format"}{$name}[$i] }, $fmt); + } } } - $result.=&Apache::response::answer_part($tag,$ans); - } elsif ($target eq 'analyze') { - push (@{ $Apache::lonhomework::analyze{"$part_id.answer"} }, $ans); - if ($high) { - push (@{ $Apache::lonhomework::analyze{"$part_id.ans_high"} }, $high); - push (@{ $Apache::lonhomework::analyze{"$part_id.ans_low"} }, $low); - } - if ($fmt) { - push (@{ $Apache::lonhomework::analyze{"$part_id.format"} }, $fmt); + if ($target eq 'answer') { + $result.= &Apache::response::answer_part($tag,join(', ',@all_answer_info)); } } - } - my @fmt_ans; - for(my $i=0;$i<=$#answers;$i++) { - my $ans=$answers[$i]; - my $fmt=$formats[0]; - if (@formats && $#formats) {$fmt=$formats[$i];} - if ($fmt && $tag eq 'numericalresponse') { - $fmt=~s/e/E/g; - if ($unit=~/\$/) { $fmt="\$".$fmt; $unit=~s/\$//g; } - if ($unit=~/\,/) { $fmt="\,".$fmt; $unit=~s/\,//g; } - $ans = &format_number($ans,$fmt,$target,$safeeval); - if ($fmt=~/\$/ && $unit!~/\$/) { $ans=~s/\$//; } - } - push(@fmt_ans,$ans); - } - my $response=join(', ',@fmt_ans); - my $hideunit=&Apache::lonnet::EXT('resource.'.$partid.'_'. - $id.'.turnoffunit'); - if ($unit ne '' && - ! ($Apache::lonhomework::type eq 'exam' || - lc($hideunit) eq "yes") ) { - my $cleanunit=$unit; - $cleanunit=~s/\$\,//g; - $response.=" $cleanunit"; - } - - my ($ad,$msg)=&check_submission($response,$partid,$id,$tag, - $parstack,$safeeval); - if ($ad ne 'EXACT_ANS' && $ad ne 'APPROX_ANS') { - my $error; - if ($tag eq 'formularesponse') { - $error=&mt('Computer\'s answer is incorrect ("[_1]").',$response); - } else { - # answer failed check if it is sig figs that is failing - my ($ad,$msg)=&check_submission($response,$partid,$id, - $tag,$parstack, - $safeeval,1); - if ($sigline ne '') { - $error=&mt('Computer\'s answer is incorrect ("[_1]"). It is likely that the tolerance range [_2] or significant figures [_3] need to be adjusted.',$response,$tolline,$sigline); - } else { - $error=&mt('Computer\'s answer is incorrect ("[_1]"). It is likely that the tolerance range [_2] needs to be adjusted.',$response,$tolline); + my @fmt_ans; + for(my $i=0;$i<=$#answers;$i++) { + my $ans=$answers[$i]; + my $fmt=$formats[0]; + if (@formats && $#formats) {$fmt=$formats[$i];} + foreach my $element (@$ans) { + if ($fmt && $tag eq 'numericalresponse') { + $fmt=~s/e/E/g; + if ($unit=~/\$/) { $fmt="\$".$fmt; $unit=~s/\$//g; } + if ($unit=~/\,/) { $fmt="\,".$fmt; $unit=~s/\,//g; } + $element = &format_number($element,$fmt,$target, + $safeeval); + if ($fmt=~/\$/ && $unit!~/\$/) { $element=~s/\$//; } + } + } + push(@fmt_ans,join(',',@$ans)); + } + my $response=\@fmt_ans; + + my $hideunit=&Apache::lonnet::EXT('resource.'.$partid.'_'. + $id.'.turnoffunit'); + if ($unit ne '' && + ! ($Apache::lonhomework::type eq 'exam' || + lc($hideunit) eq "yes") ) { + my $cleanunit=$unit; + $cleanunit=~s/\$\,//g; + foreach my $ans (@fmt_ans) { + $ans.=" $cleanunit"; } } + my ($ad,$msg)=&check_submission($response,$partid,$id,$tag, + $parstack,$safeeval); if ($ad ne 'EXACT_ANS' && $ad ne 'APPROX_ANS') { - &Apache::lonxml::error($error); - } else { - &Apache::lonxml::warning($error); + my $error; + if ($tag eq 'formularesponse') { + $error=&mt('Computer\'s answer is incorrect ("[_1]").',join(', ',@$response)); + } else { + # answer failed check if it is sig figs that is failing + my ($ad,$msg)=&check_submission($response,$partid,$id, + $tag,$parstack, + $safeeval,1); + if ($sigline ne '') { + $error=&mt('Computer\'s answer is incorrect ("[_1]"). It is likely that the tolerance range [_2] or significant figures [_3] need to be adjusted.',join(', ',@$response),$tolline,$sigline); + } else { + $error=&mt('Computer\'s answer is incorrect ("[_1]"). It is likely that the tolerance range [_2] needs to be adjusted.',join(', ',@$response),$tolline); + } + } + if ($ad ne 'EXACT_ANS' && $ad ne 'APPROX_ANS') { + &Apache::lonxml::error($error); + } else { + &Apache::lonxml::warning($error); + } } - } - if (defined($unit) and ($unit ne '') and - $tag eq 'numericalresponse') { - if ($target eq 'answer') { - if ($env{'form.answer_output_mode'} eq 'tex') { - $result.=&Apache::response::answer_part($tag, - " Unit: $unit "); - } else { - $result.=&Apache::response::answer_part($tag, - "Unit: $unit"); + if (defined($unit) and ($unit ne '') and + $tag eq 'numericalresponse') { + if ($target eq 'answer') { + if ($env{'form.answer_output_mode'} eq 'tex') { + $result.=&Apache::response::answer_part($tag, + " Unit: $unit "); + } else { + $result.=&Apache::response::answer_part($tag, + "Unit: $unit"); + } + } elsif ($target eq 'analyze') { + push (@{ $Apache::lonhomework::analyze{"$part_id.unit"} }, $unit); } - } elsif ($target eq 'analyze') { - push (@{ $Apache::lonhomework::analyze{"$part_id.unit"} }, $unit); } - } - if ($tag eq 'formularesponse' && $target eq 'answer') { - my $samples=&Apache::lonxml::get_param('samples',$parstack,$safeeval); - $result.=&Apache::response::answer_part($tag,$samples); + if ($tag eq 'formularesponse' && $target eq 'answer') { + my $samples=&Apache::lonxml::get_param('samples',$parstack,$safeeval); + $result.=&Apache::response::answer_part($tag,$samples); + } + $result.=&Apache::response::next_answer($tag,$name); } if ($target eq 'answer') { $result.=&Apache::response::answer_footer($tag); @@ -547,10 +788,49 @@ sub end_numericalresponse { $target eq 'tex' || $target eq 'analyze') { &Apache::lonxml::increment_counter($increment); } - &Apache::response::end_response; + &Apache::response::end_response(); return $result; } +sub setup_prior_tries_hash { + #FIXME support multi answer numericals/formula + my $part=$Apache::inputtags::part; + my $id=$Apache::inputtags::response[-1]; + foreach my $i (1..$Apache::lonhomework::history{'version'}) { + my $key = "$i:resource.$part.$id.submission"; + next if (!exists($Apache::lonhomework::history{"$key"})); + $Apache::inputtags::submission_display{$key} = + '
'.&HTML::Entities::encode($Apache::lonhomework::history{$key},
+					  '"<>&').'
'; + } +} + +sub check_for_answer_errors { + my ($parstack,$safeeval) = @_; + &add_in_tag_answer($parstack,$safeeval); + my %counts; + foreach my $name (keys(%answer)) { + push(@{$counts{scalar(@{$answer{$name}{'answers'}})}},$name); + } + if (scalar(keys(%counts)) > 1) { + my $counts = join(' ',map { + my $count = $_; + &mt("Answers [_1] had [_2] components.", + ''.join(', ',@{$counts{$count}}).'', + $count); + } (sort(keys(%counts)))); + &Apache::lonxml::error(&mt("All answers must have the same number of components. Varying numbers of answers were seen. ").$counts); + } + use Data::Dumper; + &Apache::lonxml::debug("count dump is ".&Dumper(\%counts)); + my $expected_number_of_inputs = (keys(%counts))[0]; + if ( $expected_number_of_inputs != scalar(@Apache::inputtags::inputlist)) { + &Apache::lonxml::error(&mt("Expected [_1] input fields, but there were only [_2] seen.", + $expected_number_of_inputs, + scalar(@Apache::inputtags::inputlist))); + } +} + sub get_table_sizes { my ($number_of_bubbles,$rbubble_values)=@_; my $scale=2; #mm for one digit @@ -620,7 +900,18 @@ sub make_numerical_bubbles { &Apache::response::get_response_param($part.'_'.$id,'numbubbles',8); my ($format)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval); - my ($answer)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval); + my $name = (exists($answer{$tag_internal_answer_name}) + ? $tag_internal_answer_name + : (sort(keys(%answer)))[0]); + + if ( scalar(@{$answer{$name}{'answers'}}) > 1) { + &Apache::lonxml::error("Only answers with 1 component are supported in exam mode"); + } + if (scalar(@{$answer{$name}{'answers'}[0]}) > 1) { + &Apache::lonxml::error("Vector answers are unsupported in exam mode."); + } + + my $answer = $answer{$name}{'answers'}[0][0]; my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack, $safeeval); if ($#incorrect eq 0) { @incorrect=(split(/,/,$incorrect[0])); } @@ -702,7 +993,7 @@ sub get_tolrange { sub get_sigrange { my ($sig)=@_; - &Apache::lonxml::debug("Got a sig of :$sig:"); + #&Apache::lonxml::debug("Got a sig of :$sig:"); my $courseid=$env{'request.course.id'}; if (lc($env{"course.$courseid.disablesigfigs"}) eq 'yes') { return (15,0); @@ -766,7 +1057,7 @@ sub start_stringresponse { $answer= &Apache::lonxml::get_param('answer',$parstack,$safeeval); } - $Apache::inputtags::answertxt{$id}=$answer; + $Apache::inputtags::answertxt{$id}=[$answer]; } } elsif ($target eq 'answer' || $target eq 'grade') { &Apache::response::reset_params(); @@ -776,7 +1067,7 @@ sub start_stringresponse { sub end_stringresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - my $increment=1; + my $result = ''; my $part=$Apache::inputtags::part; my $id=$Apache::inputtags::response[-1]; @@ -792,7 +1083,8 @@ sub end_stringresponse { $safeeval->share_from('capa',['&caparesponse_capa_check_answer']); if ($Apache::lonhomework::type eq 'exam' || &Apache::response::submitted('scantron')) { - $increment=&Apache::response::scored_response($part,$id); + &Apache::response::scored_response($part,$id); + } else { my $response = &Apache::response::getresponse(); if ( $response =~ /[^\s]/) { @@ -816,24 +1108,30 @@ sub end_stringresponse { &Apache::lonxml::debug("current $answer"); $ad = ($result) ? 'APPROX_ANS' : 'INCORRECT'; } else { - my $args_ref= - \%{$safeeval->varglob('LONCAPA::CAPAresponse_args')}; - - $$args_ref{'response'}=$response; - &Apache::lonxml::debug("current $response"); - $$args_ref{'type'}= - &Apache::lonxml::get_param('type',$parstack,$safeeval); - foreach my $key (keys(%Apache::inputtags::params)) { - $$args_ref{$key}=$Apache::inputtags::params{$key}; + my @args = ('type'); + my $args_ref = &setup_capa_args($safeeval,$parstack, + \@args,$response); + + &add_in_tag_answer($parstack,$safeeval); + my (@final_awards,@final_msgs,@names); + foreach my $name (keys(%answer)) { + &Apache::lonxml::debug(" doing $name with ".join(':',@{ $answer{$name}{'answers'} })); + ${$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=dclone($answer{$name}); + my ($result, @msgs)=&Apache::run::run("&caparesponse_check_list()",$safeeval); + &Apache::lonxml::debug('msgs are'.join(':',@msgs)); + my ($awards)=split(/:/,$result); + my (@awards) = split(/,/,$awards); + ($ad,$msg) = + &Apache::inputtags::finalizeawards(\@awards,\@msgs); + push(@final_awards,$ad); + push(@final_msgs,$msg); + push(@names,$name); + &Apache::lonxml::debug("\n
result:$result:$Apache::lonxml::curdepth
\n"); } - &Apache::lonxml::debug('answer is'.join(':',$answer)); - @{$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=($answer); - ($result, my @msgs)=&Apache::run::run("&caparesponse_check_list()",$safeeval); - &Apache::lonxml::debug('msgs are'.join(':',@msgs)); - my ($awards)=split(/:/,$result); - my (@awards) = split(/,/,$awards); - ($ad,$msg) = &Apache::inputtags::finalizeawards(\@awards,\@msgs); - &Apache::lonxml::debug("\n
result:$result:$Apache::lonxml::curdepth
\n"); + my ($ad, $msg, $name) = + &Apache::inputtags::finalizeawards(\@final_awards, + \@final_msgs, + \@names,1); } if ($Apache::lonhomework::type eq 'survey' && ($ad eq 'INCORRECT' || $ad eq 'APPROX_ANS' || @@ -846,6 +1144,7 @@ sub end_stringresponse { } } } elsif ($target eq 'answer' || $target eq 'analyze') { + &add_in_tag_answer($parstack,$safeeval); if ($target eq 'analyze') { push (@{ $Apache::lonhomework::analyze{"parts"} },"$part.$id"); $Apache::lonhomework::analyze{"$part.$id.type"} = 'stringresponse'; @@ -856,18 +1155,25 @@ sub end_stringresponse { if ($target eq 'answer') { $result.=&Apache::response::answer_header('stringresponse'); } -# foreach my $ans (@answers) { - if ($target eq 'answer') { - $result.=&Apache::response::answer_part('stringresponse',$answer); - if ($type eq 're') { + foreach my $name (keys(%answer)) { + my @answers = @{ $answer{$name}{'answers'} }; + for (my $i=0;$i<=$#answers;$i++) { + my $answer_part = $answers[$i]; + foreach my $element (@{$answer_part}) { + if ($target eq 'answer') { + $result.=&Apache::response::answer_part('stringresponse', + $element); + } elsif ($target eq 'analyze') { + push (@{ $Apache::lonhomework::analyze{"$part.$id.answer"}{$name}[$i] }, + $element); + } + } + if ($target eq 'answer' && $type eq 're') { $result.=&Apache::response::answer_part('stringresponse', $answerdisplay); } - } elsif ($target eq 'analyze') { - push (@{ $Apache::lonhomework::analyze{"$part.$id.answer"} }, - $answer); } -# } + } my $string='Case Insensitive'; if ($type eq 'mc') { $string='Multiple Choice'; @@ -898,7 +1204,7 @@ sub end_stringresponse { } if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') { - &Apache::lonxml::increment_counter($increment); + &Apache::lonxml::increment_counter(&Apache::response::repetition()); } &Apache::response::end_response; return $result;