--- loncom/homework/caparesponse/caparesponse.pm 2006/11/01 23:24:52 1.195 +++ loncom/homework/caparesponse/caparesponse.pm 2007/01/25 21:03:45 1.198.2.3 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # caparesponse definition # -# $Id: caparesponse.pm,v 1.195 2006/11/01 23:24:52 albertel Exp $ +# $Id: caparesponse.pm,v 1.198.2.3 2007/01/25 21:03:45 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -40,6 +40,11 @@ BEGIN { } 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'; @@ -400,6 +405,7 @@ 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]; @@ -431,6 +437,7 @@ sub end_numericalresponse { } } } elsif ($target eq 'web' || $target eq 'tex') { + &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') { @@ -523,6 +530,11 @@ sub end_numericalresponse { } 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}=[]; + } + } my ($sigline,$tolline); if ($name ne $tag_internal_answer_name || scalar(keys(%answer)) > 1) { @@ -542,13 +554,13 @@ sub end_numericalresponse { } else { @vector = ($ans); } - if ($target eq 'answer') { - 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'}); - } + 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; } @@ -572,21 +584,20 @@ sub end_numericalresponse { } } 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); + } } + } + if ($target eq 'answer') { $result.= &Apache::response::answer_part($tag,join(', ',@all_answer_info)); - } elsif ($target eq 'analyze') { - my ($high,$low); - if ($Apache::inputtags::params{'tol'}) { - ($high,$low)=&get_tolrange($ans,$Apache::inputtags::params{'tol'}); - } - 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); - } } } @@ -672,10 +683,36 @@ 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 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 @@ -745,7 +782,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])); } @@ -978,6 +1026,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'; @@ -988,18 +1037,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';