--- loncom/homework/caparesponse/caparesponse.pm 2006/12/11 17:37:44 1.199 +++ 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.199 2006/12/11 17:37:44 www Exp $ +# $Id: caparesponse.pm,v 1.209 2007/03/01 02:31:29 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -33,6 +33,7 @@ use Safe::Hole; use Apache::lonmaxima(); use Apache::lonlocal; use Apache::lonnet; +use Apache::response(); use Storable qw(dclone); BEGIN { @@ -40,6 +41,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'; @@ -55,19 +61,63 @@ 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; + 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; } @@ -82,10 +132,21 @@ sub end_answergroup { $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; @@ -98,6 +159,13 @@ sub start_value { 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; } @@ -105,9 +173,17 @@ 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; @@ -120,6 +196,13 @@ sub start_vector { @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; } @@ -127,9 +210,17 @@ sub start_vector { 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; @@ -167,6 +258,7 @@ sub start_numericalresponse { &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); @@ -231,6 +323,13 @@ sub set_answertext { $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, @@ -372,8 +471,19 @@ sub add_in_tag_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) { @@ -384,7 +494,6 @@ sub end_numericalresponse { my $tag; my $safehole = new Safe::Hole; $safeeval->share_from('capa',['&caparesponse_capa_check_answer']); - $safehole->wrap(\&Apache::lonmaxima::maxima_check,$safeeval,'&maxima_check'); if (scalar(@$tagstack)) { $tag=$$tagstack[-1]; } if ( $target eq 'grade' && &Apache::response::submitted() ) { @@ -400,6 +509,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]; @@ -491,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') { @@ -524,6 +635,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) { @@ -543,13 +659,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; } @@ -573,21 +689,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); - } } } @@ -677,6 +792,19 @@ sub end_numericalresponse { 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); @@ -772,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])); } @@ -1005,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'; @@ -1015,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';