--- loncom/homework/caparesponse/caparesponse.pm 2007/03/01 02:31:29 1.209 +++ loncom/homework/caparesponse/caparesponse.pm 2007/08/29 21:55:37 1.218 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # caparesponse definition # -# $Id: caparesponse.pm,v 1.209 2007/03/01 02:31:29 albertel Exp $ +# $Id: caparesponse.pm,v 1.218 2007/08/29 21:55:37 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -392,9 +392,6 @@ sub setup_capa_args { sub setup_capa_response { my ($args_ref,$response) = @_; - use Data::Dumper; - &Apache::lonxml::debug("response dump is ".&Dumper($response)); - if (ref($response)) { $$args_ref{'response'}=dclone($response); } else { @@ -434,6 +431,10 @@ sub check_submission { &add_in_tag_answer($parstack,$safeeval); + if (!%answer) { + &Apache::lonxml::error("No answers are defined"); + } + my (@final_awards,@final_msgs,@names); foreach my $name (keys(%answer)) { &Apache::lonxml::debug(" doing $name with ".join(':',@{ $answer{$name}{'answers'} })); @@ -465,7 +466,7 @@ sub add_in_tag_answer { my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval, $response_level); &Apache::lonxml::debug('answer is'.join(':',@answer)); - if (@answer && defined($answer[0])) { + if (@answer && $answer[0] =~ /\S/) { $answer{$tag_internal_answer_name}= {'type' => 'ordered', 'answers' => [\@answer] }; } @@ -601,13 +602,14 @@ sub end_numericalresponse { } } } - &setup_prior_tries_hash(); + &Apache::response::setup_prior_tries_hash(\&format_prior_response_numerical); } elsif ($target eq 'edit') { $result.=''.&Apache::edit::end_table; } elsif ($target eq 'answer' || $target eq 'analyze') { my $part_id="$partid.$id"; if ($target eq 'analyze') { push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id); + push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} }, 1); $Apache::lonhomework::analyze{"$part_id.type"} = $tag; my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval); if ($#incorrect eq 0) { @incorrect=(split(/,/,$incorrect[0])); } @@ -792,17 +794,20 @@ 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 format_prior_response_numerical { + my ($mode,$answer) = @_; + if (ref($answer)) { + my $result = '
'. + &HTML::Entities::encode($element,'"<>&').' | '; + } + $result.='