--- loncom/homework/caparesponse/caparesponse.pm 2007/03/15 02:51:29 1.210 +++ loncom/homework/caparesponse/caparesponse.pm 2008/03/06 02:48:23 1.222 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # caparesponse definition # -# $Id: caparesponse.pm,v 1.210 2007/03/15 02:51:29 albertel Exp $ +# $Id: caparesponse.pm,v 1.222 2008/03/06 02:48:23 www 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,7 +602,7 @@ 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') { @@ -786,24 +787,35 @@ sub end_numericalresponse { } if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') { - &Apache::lonxml::increment_counter($increment); + if (($tag eq 'formularesponse') && ($target eq 'analyze')) { + my $type = &Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.type'); + if ($type eq 'exam') { + $increment = &Apache::response::repetition(); + } + } + &Apache::lonxml::increment_counter($increment,"$partid.$id"); + if ($target eq 'analyze') { + &Apache::lonhomework::set_bubble_lines(); + } } &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 format_prior_response_numerical { + my ($mode,$answer) = @_; + if (ref($answer)) { + my $result = ''; + foreach my $element (@{ $answer }) { + $result.= ''; + } + $result.='
'. + &HTML::Entities::encode($element,'"<>&').'
'; + return $result; } + return ''. + &HTML::Entities::encode($answer,'"<>&').''; + } sub check_for_answer_errors { @@ -822,10 +834,9 @@ sub check_for_answer_errors { } (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)) { + if ( $expected_number_of_inputs > 0 + && $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))); @@ -861,7 +872,13 @@ sub get_table_sizes { my $bubbles_per_line=int($textwidth/$cell_width); if ($bubbles_per_line > $number_of_bubbles) { $bubbles_per_line=$number_of_bubbles; - }elsif (($bubbles_per_line > $number_of_bubbles/2) && ($number_of_bubbles % 2==0)) {$bubbles_per_line=$number_of_bubbles/2;} + } elsif (($bubbles_per_line > $number_of_bubbles/2) + && ($number_of_bubbles % 2==0)) { + $bubbles_per_line=$number_of_bubbles/2; + } + if ($bubbles_per_line < 1) { + $bubbles_per_line=1; + } my $number_of_tables = int($number_of_bubbles/$bubbles_per_line); my @table_range = (); for (my $i=0;$i<$number_of_tables;$i++) {push @table_range,$bubbles_per_line;} @@ -896,6 +913,11 @@ sub format_number { sub make_numerical_bubbles { my ($part,$id,$target,$parstack,$safeeval) =@_; + + if (!%answer) { + &Apache::lonxml::error(&mt("No answers defined for response [_1] in part [_2] to make bubbles for.",$id,$part)); + return ([],[],undef); + } my $number_of_bubbles = &Apache::response::get_response_param($part.'_'.$id,'numbubbles',8); @@ -966,13 +988,23 @@ sub make_numerical_bubbles { $ind=&Math::Random::random_uniform_integer(1,0,$#factors); my $factor = $factors[$ind]; my @bubble_display; + my $answerfactor=$answer; + if ($answer==0) { + $answerfactor=&Math::Random::random_uniform_integer(1,1,100)/ + &Math::Random::random_uniform_integer(1,1,10); + } for ($ind=0;$ind<$number_of_bubbles;$ind++) { - $bubble_values[$ind] = $answer*($factor**($power-$powers[$#powers-$ind])); + $bubble_values[$ind] = $answerfactor*($factor**($power-$powers[$#powers-$ind])); $bubble_display[$ind] = &format_number($bubble_values[$ind], $format,$target,$safeeval); - } my $correct = $alphabet[$number_of_bubbles-$power]; + if ($answer==0) { + $correct='A'; + $bubble_values[0]=0; + $bubble_display[0] = &format_number($bubble_values[0], + $format,$target,$safeeval); + } &Math::Random::random_set_seed(@oldseed); return (\@bubble_values,\@bubble_display,$correct); } @@ -996,7 +1028,8 @@ sub get_sigrange { my ($sig)=@_; #&Apache::lonxml::debug("Got a sig of :$sig:"); my $courseid=$env{'request.course.id'}; - if (lc($env{"course.$courseid.disablesigfigs"}) eq 'yes') { + if ($env{'request.state'} ne 'construct' + && lc($env{"course.$courseid.disablesigfigs"}) eq 'yes') { return (15,0); } my $sig_lbound; @@ -1025,6 +1058,12 @@ sub get_sigrange { return ($sig_ubound,$sig_lbound); } +sub format_prior_response_string { + my ($mode,$answer) =@_; + return ''. + &HTML::Entities::encode($answer,'"<>&').''; +} + sub start_stringresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; @@ -1202,10 +1241,16 @@ sub end_stringresponse { } } elsif ($target eq 'edit') { $result.=''.&Apache::edit::end_table; + } elsif ($target eq 'web' || $target eq 'tex') { + &Apache::response::setup_prior_tries_hash(\&format_prior_response_string); } if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') { - &Apache::lonxml::increment_counter(&Apache::response::repetition()); + &Apache::lonxml::increment_counter(&Apache::response::repetition(), + "$part.$id"); + if ($target eq 'analyze') { + &Apache::lonhomework::set_bubble_lines(); + } } &Apache::response::end_response; return $result;