[BACK]Return to caparesponse.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework / caparesponse

Diff for /loncom/homework/caparesponse/caparesponse.pm between versions 1.214 and 1.219

version 1.214, 2007/05/22 00:45:43 version 1.219, 2007/08/29 21:57:47
Line 392  sub setup_capa_args { Line 392  sub setup_capa_args {
 sub setup_capa_response {  sub setup_capa_response {
     my ($args_ref,$response) = @_;         my ($args_ref,$response) = @_;   
   
     use Data::Dumper;  
     &Apache::lonxml::debug("response dump is ".&Dumper($response));  
       
     if (ref($response)) {      if (ref($response)) {
  $$args_ref{'response'}=dclone($response);   $$args_ref{'response'}=dclone($response);
     } else {      } else {
Line 434  sub check_submission { Line 431  sub check_submission {
           
     &add_in_tag_answer($parstack,$safeeval);      &add_in_tag_answer($parstack,$safeeval);
   
       if (!%answer) {
    &Apache::lonxml::error("No answers are defined");
       }
   
     my (@final_awards,@final_msgs,@names);      my (@final_awards,@final_msgs,@names);
     foreach my $name (keys(%answer)) {      foreach my $name (keys(%answer)) {
  &Apache::lonxml::debug(" doing $name with ".join(':',@{ $answer{$name}{'answers'} }));   &Apache::lonxml::debug(" doing $name with ".join(':',@{ $answer{$name}{'answers'} }));
Line 608  sub end_numericalresponse { Line 609  sub end_numericalresponse {
  my $part_id="$partid.$id";   my $part_id="$partid.$id";
  if ($target eq 'analyze') {   if ($target eq 'analyze') {
     push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);      push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id);
       push (@{ $Apache::lonhomework::analyze{"$part_id.bubble_lines"} }, 1);
     $Apache::lonhomework::analyze{"$part_id.type"} = $tag;      $Apache::lonhomework::analyze{"$part_id.type"} = $tag;
     my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval);      my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval);
     if ($#incorrect eq 0) { @incorrect=(split(/,/,$incorrect[0])); }      if ($#incorrect eq 0) { @incorrect=(split(/,/,$incorrect[0])); }
Line 824  sub check_for_answer_errors { Line 826  sub check_for_answer_errors {
  } (sort(keys(%counts))));   } (sort(keys(%counts))));
  &Apache::lonxml::error(&mt("All answers must have the same number of components. Varying numbers of answers were seen. ").$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];      my $expected_number_of_inputs = (keys(%counts))[0];
     if ( $expected_number_of_inputs > 0       if ( $expected_number_of_inputs > 0 
  && $expected_number_of_inputs != scalar(@Apache::inputtags::inputlist)) {   && $expected_number_of_inputs != scalar(@Apache::inputtags::inputlist)) {
Line 864  sub get_table_sizes { Line 864  sub get_table_sizes {
     my $bubbles_per_line=int($textwidth/$cell_width);      my $bubbles_per_line=int($textwidth/$cell_width);
     if ($bubbles_per_line > $number_of_bubbles) {      if ($bubbles_per_line > $number_of_bubbles) {
  $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 $number_of_tables = int($number_of_bubbles/$bubbles_per_line);
     my @table_range = ();      my @table_range = ();
     for (my $i=0;$i<$number_of_tables;$i++) {push @table_range,$bubbles_per_line;}      for (my $i=0;$i<$number_of_tables;$i++) {push @table_range,$bubbles_per_line;}
Line 899  sub format_number { Line 905  sub format_number {
   
 sub make_numerical_bubbles {  sub make_numerical_bubbles {
     my ($part,$id,$target,$parstack,$safeeval) =@_;      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 =       my $number_of_bubbles = 
  &Apache::response::get_response_param($part.'_'.$id,'numbubbles',8);   &Apache::response::get_response_param($part.'_'.$id,'numbubbles',8);
Line 999  sub get_sigrange { Line 1010  sub get_sigrange {
     my ($sig)=@_;      my ($sig)=@_;
     #&Apache::lonxml::debug("Got a sig of :$sig:");      #&Apache::lonxml::debug("Got a sig of :$sig:");
     my $courseid=$env{'request.course.id'};      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);   return (15,0);
     }      }
     my $sig_lbound;      my $sig_lbound;
Removed from v.1.214  
changed lines
  Added in v.1.219

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>