[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.192 and 1.215

version 1.192, 2006/06/19 16:16:21 version 1.215, 2007/06/05 22:30:05
Line 33  use Safe::Hole; Line 33  use Safe::Hole;
 use Apache::lonmaxima();  use Apache::lonmaxima();
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonnet;  use Apache::lonnet;
   use Apache::response();
   use Storable qw(dclone);
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse','stringresponse','formularesponse'));      &Apache::lonxml::register('Apache::caparesponse',('numericalresponse','stringresponse','formularesponse'));
 }  }
   
 my %answer;  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 $cur_name;
   my $tag_internal_answer_name = 'INTERNAL';
   
 sub start_answer {  sub start_answer {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;      my $result;
Line 52  sub start_answer { Line 61  sub start_answer {
     if (!defined($type)) { $type = 'ordered' };      if (!defined($type)) { $type = 'ordered' };
     $answer{$cur_name}= { 'type' => $type,      $answer{$cur_name}= { 'type' => $type,
   'answers' => [] };    '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;      return $result;
 }  }
   
 sub end_answer {  sub end_answer {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;      my $result;
       if ($target eq 'edit') {
    $result .= &Apache::edit::tag_end();
       }
   
     undef($cur_name);      undef($cur_name);
     return $result;      return $result;
 }  }
   
   sub insert_answer {
       return '
           <answer>
               <value></value>
           </answer>';
   }
   
 sub start_answergroup {  sub start_answergroup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;      my $result;
     my $id = $Apache::inputtags::response[-1];      if ($target eq 'edit') {
     my $dis = &Apache::lonxml::get_param('answerdisplay',$parstack,$safeeval);    $result.=&Apache::edit::tag_start($target,$token);
     if (defined($dis)) { $Apache::inputtags::answertxt{$id}=$dis; }   $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;      return $result;
 }  }
   
 sub end_answergroup {  sub end_answergroup {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;      my $result;
       if ($target eq 'web') {
       if (  &Apache::response::show_answer() ) {  
       my $partid = $Apache::inputtags::part;
       my $id = $Apache::inputtags::response[-1];
       &set_answertext($Apache::lonhomework::history{"resource.$partid.$id.answername"},
       $target,$token,$tagstack,$parstack,$parser,
       $safeeval,-2);
    }
       } elsif ($target eq 'edit') {
    $result .= &Apache::edit::tag_end();
       }
     return $result;      return $result;
 }  }
   
   sub insert_answergroup {
       return '
       <answergroup>
           <answer>
               <value></value>
           </answer>
       </answergroup>';
   }
   
 sub start_value {  sub start_value {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      my $result;
Line 86  sub start_value { Line 156  sub start_value {
  my $bodytext = &Apache::lonxml::get_all_text("/value",$parser,$style);   my $bodytext = &Apache::lonxml::get_all_text("/value",$parser,$style);
  $bodytext = &Apache::run::evaluate($bodytext,$safeeval,   $bodytext = &Apache::run::evaluate($bodytext,$safeeval,
    $$parstack[-1]);     $$parstack[-1]);
  push(@{ $answer{$cur_name}{'answers'} },$bodytext);  
    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;      return $result;
 }  }
Line 94  sub start_value { Line 173  sub start_value {
 sub end_value {  sub end_value {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;      my $result;
       if ($target eq 'edit') {
    $result = &Apache::edit::end_table();
       }
     return $result;      return $result;
 }  }
   
   sub insert_value {
       return '
               <value></value>';
   }
   
   sub start_vector {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       my $result;
       if ( $target eq 'web' || $target eq 'tex' ||
    $target eq 'grade' || $target eq 'webgrade' ||
    $target eq 'answer' || $target eq 'analyze' ) {
    my $bodytext = &Apache::lonxml::get_all_text("/vector",$parser,$style);
    my @values = &Apache::run::run($bodytext,$safeeval,$$parstack[-1]);
    if (@values == 1) {
       @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;
   }
   
   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 '
               <value></value>';
   }
   
 sub start_array {  sub start_array {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      my $result;
Line 131  sub end_unit { Line 255  sub end_unit {
   
 sub start_numericalresponse {  sub start_numericalresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     &Apache::lonxml::register('Apache::caparesponse',('answer','answergroup','value','array','unit'));      &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 $id = &Apache::response::start_response($parstack,$safeeval);
     my $result;      my $result;
     undef(%answer);      undef(%answer);
Line 184  sub start_numericalresponse { Line 311  sub start_numericalresponse {
     if ($unit =~ /\S/) { $result.=" (in $unit) "; }      if ($unit =~ /\S/) { $result.=" (in $unit) "; }
  }   }
  if (  &Apache::response::show_answer() ) {   if (  &Apache::response::show_answer() ) {
     my $answertxt;      &set_answertext($tag_internal_answer_name,$target,$token,$tagstack,
     my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,      $parstack,$parser,$safeeval,-1);
  $safeeval);   }
     my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,      }
  $safeeval);      return $result;
     my $unit=&Apache::lonxml::get_param_var('unit',$parstack,  }
     $safeeval);  
     for (my $i=0; $i <= $#answers; $i++) {  sub set_answertext {
  my $answer=$answers[$i];      my ($name,$target,$token,$tagstack,$parstack,$parser,$safeeval,
  if ( scalar(@$tagstack)   $response_level) = @_;
      && $tagstack->[-1] ne 'numericalresponse') {      &add_in_tag_answer($parstack,$safeeval,$response_level);
     $answertxt.=$answer.',';  
       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,
    $safeeval,$response_level);
       my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval,
       $response_level);
   
       &Apache::lonxml::debug("answer looks to be $name");
       my @answertxt;
       for (my $i=0; $i < scalar(@{$answer{$name}{'answers'}}); $i++) {
    my $answertxt;
    my $answer=$answer{$name}{'answers'}[$i];
    foreach my $element (@$answer) {
       if ( scalar(@$tagstack)
    && $tagstack->[$response_level] ne 'numericalresponse') {
    $answertxt.=$element.',';
       } else {
    my $format;
    if ($#formats > 0) {
       $format=$formats[$i];
  } else {   } else {
     my $format;      $format=$formats[0];
     if ($#formats > 0) {  
  $format=$formats[$i];  
     } else {  
  $format=$formats[0];  
     }  
     if ($unit=~/\$/) { $format="\$".$format; $unit=~s/\$//g; }  
     if ($unit=~/\,/) { $format="\,".$format; $unit=~s/\,//g; }  
     my $formatted=&format_number($answer,$format,$target,  
  $safeeval);  
     $answertxt.=$formatted.',';  
  }   }
    if ($unit=~/\$/) { $format="\$".$format; $unit=~s/\$//g; }
    if ($unit=~/\,/) { $format="\,".$format; $unit=~s/\,//g; }
    my $formatted=&format_number($element,$format,$target,
        $safeeval);
    $answertxt.=' '.$formatted.',';
     }      }
     chop $answertxt;      
     if ($target eq 'web') {   }
  $answertxt.=" $unit ";   chop($answertxt);
     }   if ($target eq 'web') {
     $Apache::inputtags::answertxt{$id}=$answertxt;      $answertxt.=" $unit ";
  }   }
   
    push(@answertxt,$answertxt)
     }      }
     return $result;  
       my $id = $Apache::inputtags::response[-1];
       $Apache::inputtags::answertxt{$id}=\@answertxt;
 }  }
   
 sub check_submission {  sub setup_capa_args {
     my ($response,$partid,$id,$tag,$parstack,$safeeval,$ignore_sig)=@_;      my ($safeeval,$parstack,$args,$response) = @_;
     my $args_ref= \%{$safeeval->varglob('LONCAPA::CAPAresponse_args')};      my $args_ref= \%{$safeeval->varglob('LONCAPA::CAPAresponse_args')};
     $$args_ref{'response'}=$response;      undef(%{ $args_ref });
     my $hideunit=&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffunit');   
           foreach my $arg (@{$args}) {
     foreach my $arg ('type','tol','sig','format','unit','calc',  
      'samples') {  
  $$args_ref{$arg}=   $$args_ref{$arg}=
     &Apache::lonxml::get_param($arg,$parstack,$safeeval);      &Apache::lonxml::get_param($arg,$parstack,$safeeval);
     }      }
     foreach my $key (keys(%Apache::inputtags::params)) {      foreach my $key (keys(%Apache::inputtags::params)) {
  $$args_ref{$key}=$Apache::inputtags::params{$key};   $$args_ref{$key}=$Apache::inputtags::params{$key};
     }      }
           &setup_capa_response($args_ref,$response);
     #no way to enter units, with radio buttons      return $args_ref;
   }
   
   sub setup_capa_response {
       my ($args_ref,$response) = @_;   
   
       if (ref($response)) {
    $$args_ref{'response'}=dclone($response);
       } else {
    $$args_ref{'response'}=dclone([$response]);
       }
   }
   
   sub check_submission {
       my ($response,$partid,$id,$tag,$parstack,$safeeval,$ignore_sig)=@_;
       my @args = ('type','tol','sig','format','unit','calc','samples');
       my $args_ref = &setup_capa_args($safeeval,$parstack,\@args,$response);
   
       my $hideunit=
    &Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffunit');
           #no way to enter units, with radio buttons
     if ($Apache::lonhomework::type eq 'exam' ||      if ($Apache::lonhomework::type eq 'exam' ||
  lc($hideunit) eq "yes") {   lc($hideunit) eq "yes") {
  delete($$args_ref{'unit'});   delete($$args_ref{'unit'});
Line 257  sub check_submission { Line 428  sub check_submission {
     } elsif ($tag eq 'numericalresponse') {      } elsif ($tag eq 'numericalresponse') {
  $$args_ref{'type'}='float';   $$args_ref{'type'}='float';
     }      }
     my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);      
     &Apache::lonxml::debug('answer is'.join(':',@answer));      &add_in_tag_answer($parstack,$safeeval);
     if (@answer && defined($answer[0])) {  
  $answer{'INTERNAL'}= {'type' => 'ordered',      my (@final_awards,@final_msgs,@names);
       'answers' => \@answer };  
     }  
     #FIXME would be nice if we could save name so we know who graded him  
     #correct  
     my (%results,@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'} }));
  @{$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=@{ $answer{$name}{'answers'} };  
    ${$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=dclone($answer{$name});
    &setup_capa_response($args_ref,$response);
    use Time::HiRes;
    my $t0 = [Time::HiRes::gettimeofday()];
  my ($result,@msgs) =    my ($result,@msgs) = 
     &Apache::run::run("&caparesponse_check_list()",$safeeval);      &Apache::run::run("&caparesponse_check_list()",$safeeval);
    &Apache::lonxml::debug("checking $name $result with $response took ".&Time::HiRes::tv_interval($t0));
  &Apache::lonxml::debug('msgs are '.join(':',@msgs));   &Apache::lonxml::debug('msgs are '.join(':',@msgs));
  my ($awards)=split(/:/,$result);   my ($awards)=split(/:/,$result);
  my @awards= split(/,/,$awards);   my @awards= split(/,/,$awards);
  my ($ad, $msg) = &Apache::inputtags::finalizeawards(\@awards,\@msgs);   my ($ad, $msg) = &Apache::inputtags::finalizeawards(\@awards,\@msgs);
  $results{$name}= [$ad,$msg];  
  push(@final_awards,$ad);   push(@final_awards,$ad);
  push(@final_msgs,$msg);   push(@final_msgs,$msg);
  push(@names,$name);   push(@names,$name);
Line 283  sub check_submission { Line 453  sub check_submission {
     my ($ad, $msg, $name) = &Apache::inputtags::finalizeawards(\@final_awards,      my ($ad, $msg, $name) = &Apache::inputtags::finalizeawards(\@final_awards,
        \@final_msgs,         \@final_msgs,
        \@names,1);         \@names,1);
     return($ad,$msg);      &Apache::lonxml::debug(" name of picked award is $name from ".join(', ',@names));
       return($ad,$msg, $name);
   }
   
   sub add_in_tag_answer {
       my ($parstack,$safeeval,$response_level) = @_;
       my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval,
         $response_level);
       &Apache::lonxml::debug('answer is'.join(':',@answer));
       if (@answer && $answer[0] =~ /\S/) {
    $answer{$tag_internal_answer_name}= {'type' => 'ordered',
        'answers' => [\@answer] };
       }
   }
   
   sub capa_formula_fix {
      my ($expression)=@_;
      return &Apache::response::implicit_multiplication($expression);
 }  }
   
 sub end_numericalresponse {  sub end_numericalresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      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 $increment=1;
     my $result = '';      my $result = '';
     if (!$Apache::lonxml::default_homework_loaded) {      if (!$Apache::lonxml::default_homework_loaded) {
Line 298  sub end_numericalresponse { Line 491  sub end_numericalresponse {
     my $tag;      my $tag;
     my $safehole = new Safe::Hole;      my $safehole = new Safe::Hole;
     $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);      $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
     $safehole->wrap(\&Apache::lonmaxima::maxima_check,$safeeval,'&maxima_check');  
   
     if (scalar(@$tagstack)) { $tag=$$tagstack[-1]; }      if (scalar(@$tagstack)) { $tag=$$tagstack[-1]; }
     if ( $target eq 'grade' && &Apache::response::submitted() ) {      if ( $target eq 'grade' && &Apache::response::submitted() ) {
Line 314  sub end_numericalresponse { Line 506  sub end_numericalresponse {
  &Apache::lonxml::debug($$parstack[-1] . "\n<br>");   &Apache::lonxml::debug($$parstack[-1] . "\n<br>");
   
  if ( &Apache::response::submitted('scantron')) {   if ( &Apache::response::submitted('scantron')) {
       &add_in_tag_answer($parstack,$safeeval);
     my ($values,$display)=&make_numerical_bubbles($partid,$id,      my ($values,$display)=&make_numerical_bubbles($partid,$id,
   $target,$parstack,$safeeval);    $target,$parstack,$safeeval);
     $response=$values->[$response];      $response=$values->[$response];
  }   }
  $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;   $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
  my ($ad,$msg)=&check_submission($response,$partid,$id,   my ($ad,$msg,$name)=&check_submission($response,$partid,$id,
  $tag,$parstack,$safeeval);        $tag,$parstack,
         $safeeval);
   
  &Apache::lonxml::debug('ad is'.$ad);   &Apache::lonxml::debug('ad is'.$ad);
  if ($ad eq 'SIG_FAIL') {   if ($ad eq 'SIG_FAIL') {
Line 339  sub end_numericalresponse { Line 533  sub end_numericalresponse {
  &Apache::response::handle_previous(\%previous,$ad);   &Apache::response::handle_previous(\%previous,$ad);
  $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;   $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
  $Apache::lonhomework::results{"resource.$partid.$id.awardmsg"}=$msg;   $Apache::lonhomework::results{"resource.$partid.$id.awardmsg"}=$msg;
    $Apache::lonhomework::results{"resource.$partid.$id.answername"}=$name;
  $result='';   $result='';
     }      }
  }   }
     } elsif ($target eq 'web' || $target eq 'tex') {      } elsif ($target eq 'web' || $target eq 'tex') {
  my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,   &check_for_answer_errors($parstack,$safeeval);
      $safeeval);  
  my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};   my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
  my $status = $Apache::inputtags::status['-1'];   my $status = $Apache::inputtags::status['-1'];
  if ($Apache::lonhomework::type eq 'exam') {   if ($Apache::lonhomework::type eq 'exam') {
       # FIXME support multi dimensional numerical problems
               #       in exam bubbles
     my ($bubble_values,$bubble_display)=      my ($bubble_values,$bubble_display)=
  &make_numerical_bubbles($partid,$id,$target,$parstack,   &make_numerical_bubbles($partid,$id,$target,$parstack,
  $safeeval);   $safeeval);
Line 402  sub end_numericalresponse { Line 598  sub end_numericalresponse {
  }   }
     }      }
  }   }
    &Apache::response::setup_prior_tries_hash(\&format_prior_response_numerical);
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result.='</td></tr>'.&Apache::edit::end_table;   $result.='</td></tr>'.&Apache::edit::end_table;
     } elsif ($target eq 'answer' || $target eq 'analyze') {      } elsif ($target eq 'answer' || $target eq 'analyze') {
Line 418  sub end_numericalresponse { Line 615  sub end_numericalresponse {
  if (scalar(@$tagstack)) {   if (scalar(@$tagstack)) {
     &Apache::response::setup_params($tag,$safeeval);      &Apache::response::setup_params($tag,$safeeval);
  }   }
  my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);   &add_in_tag_answer($parstack,$safeeval);
  my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);   my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);
   
  my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval);   my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval);
  my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval);  
   
  if ($target eq 'answer') {   if ($target eq 'answer') {
     $result.=&Apache::response::answer_header($tag);      $result.=&Apache::response::answer_header($tag,undef,
         scalar(keys(%answer)));
     if ($tag eq 'numericalresponse'      if ($tag eq 'numericalresponse'
  && $Apache::lonhomework::type eq 'exam') {   && $Apache::lonhomework::type eq 'exam') {
  my ($bubble_values,undef,$correct) = &make_numerical_bubbles($partid,   my ($bubble_values,undef,$correct) = &make_numerical_bubbles($partid,
Line 432  sub end_numericalresponse { Line 630  sub end_numericalresponse {
  $result.=&Apache::response::answer_part($tag,$correct);   $result.=&Apache::response::answer_part($tag,$correct);
     }      }
  }   }
  my ($sigline,$tolline);   foreach my $name (sort(keys(%answer))) {
  for(my $i=0;$i<=$#answers;$i++) {      my @answers = @{ $answer{$name}{'answers'} };
     my $ans=$answers[$i];      if ($target eq 'analyze') {
     my $fmt=$formats[0];   foreach my $info ('answer','ans_high','ans_low','format') {
     if (@formats && $#formats) {$fmt=$formats[$i];}      $Apache::lonhomework::analyze{"$part_id.$info"}{$name}=[];
     my ($high,$low);  
     if ($Apache::inputtags::params{'tol'}) {  
  ($high,$low)=&get_tolrange($ans,$Apache::inputtags::params{'tol'});  
     }  
     my ($sighigh,$siglow);  
     if ($Apache::inputtags::params{'sig'}) {  
  ($sighigh,$siglow)=&get_sigrange($Apache::inputtags::params{'sig'});  
     }  
     if ($fmt && $tag eq 'numericalresponse') {  
  $fmt=~s/e/E/g;  
  if ($unit=~/\$/) { $fmt="\$".$fmt; $unit=~s/\$//g; }  
  if ($unit=~/\,/) { $fmt="\,".$fmt; $unit=~s/\,//g; }  
  $ans = &format_number($ans,$fmt,$target,$safeeval);  
  #if ($high) {  
  #    $high=&format_number($high,$fmt,$target,$safeeval);  
  #    $low =&format_number($low,$fmt,$target,$safeeval);  
  #}  
     }  
     if ($target eq 'answer') {  
  if ($high && $tag eq 'numericalresponse') {  
     $ans.=' ['.$low.','.$high.']';  
     $tolline .= "[$low, $high]";  
  }   }
  if (defined($sighigh) && $tag eq 'numericalresponse') {      }
     if ($env{'form.answer_output_mode'} eq 'tex') {      my ($sigline,$tolline);
  $ans.= " Sig $siglow - $sighigh";      if ($name ne $tag_internal_answer_name 
     } else {   || scalar(keys(%answer)) > 1) {
  $ans.= " Sig <i>$siglow - $sighigh</i>";   $result.=&Apache::response::answer_part($tag,$name);
  $sigline .= "[$siglow, $sighigh]";      }
       for(my $i=0;$i<=$#answers;$i++) {
    my $ans=$answers[$i];
    my $fmt=$formats[0];
    if (@formats && $#formats) {$fmt=$formats[$i];}
    my ($sighigh,$siglow);
    if ($Apache::inputtags::params{'sig'}) {
       ($sighigh,$siglow)=&get_sigrange($Apache::inputtags::params{'sig'});
    }
    my @vector;
    if (ref($ans)) {
       @vector = @{ $ans };
    } else {
       @vector = ($ans);
    }
    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; }
       if ($unit=~/\,/) { $fmt="\,".$fmt; $unit=~s/\,//g; }
       $element = &format_number($element,$fmt,$target,$safeeval);
       #if ($high) {
       #    $high=&format_number($high,$fmt,$target,$safeeval);
       #    $low =&format_number($low,$fmt,$target,$safeeval);
       #}
    }
    if ($high && $tag eq 'numericalresponse') {
       $element.=' ['.$low.','.$high.']';
       $tolline .= "[$low, $high]";
    }
    if (defined($sighigh) && $tag eq 'numericalresponse') {
       if ($env{'form.answer_output_mode'} eq 'tex') {
    $element.= " Sig $siglow - $sighigh";
       } else {
    $element.= " Sig <i>$siglow - $sighigh</i>";
    $sigline .= "[$siglow, $sighigh]";
       }
    }
    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);
    }
     }      }
  }   }
  $result.=&Apache::response::answer_part($tag,$ans);   if ($target eq 'answer') {
     } elsif ($target eq 'analyze') {      $result.= &Apache::response::answer_part($tag,join(', ',@all_answer_info));
  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);  
  }   }
     }      }
  }  
   
  my @fmt_ans;      my @fmt_ans;
  for(my $i=0;$i<=$#answers;$i++) {      for(my $i=0;$i<=$#answers;$i++) {
     my $ans=$answers[$i];   my $ans=$answers[$i];
     my $fmt=$formats[0];   my $fmt=$formats[0];
     if (@formats && $#formats) {$fmt=$formats[$i];}   if (@formats && $#formats) {$fmt=$formats[$i];}
     if ($fmt && $tag eq 'numericalresponse') {   foreach my $element (@$ans) {    
  $fmt=~s/e/E/g;      if ($fmt && $tag eq 'numericalresponse') {
  if ($unit=~/\$/) { $fmt="\$".$fmt; $unit=~s/\$//g; }   $fmt=~s/e/E/g;
  if ($unit=~/\,/) { $fmt="\,".$fmt; $unit=~s/\,//g; }   if ($unit=~/\$/) { $fmt="\$".$fmt; $unit=~s/\$//g; }
  $ans = &format_number($ans,$fmt,$target,$safeeval);   if ($unit=~/\,/) { $fmt="\,".$fmt; $unit=~s/\,//g; }
  if ($fmt=~/\$/ && $unit!~/\$/) { $ans=~s/\$//; }   $element = &format_number($element,$fmt,$target,
     }    $safeeval);
     push(@fmt_ans,$ans);   if ($fmt=~/\$/ && $unit!~/\$/) { $element=~s/\$//; }
  }      }
  my $response=join(', ',@fmt_ans);  
  my $hideunit=&Apache::lonnet::EXT('resource.'.$partid.'_'.  
   $id.'.turnoffunit');  
  if ($unit ne ''  &&   
     ! ($Apache::lonhomework::type eq 'exam' ||  
        lc($hideunit) eq "yes") )  {  
     my $cleanunit=$unit;  
     $cleanunit=~s/\$\,//g;  
     $response.=" $cleanunit";  
  }  
   
  my ($ad,$msg)=&check_submission($response,$partid,$id,$tag,  
  $parstack,$safeeval);  
  if ($ad ne 'EXACT_ANS' && $ad ne 'APPROX_ANS') {  
     my $error;  
     if ($tag eq 'formularesponse') {  
  $error=&mt('Computer\'s answer is incorrect ("[_1]").',$response);  
     } else {  
  # answer failed check if it is sig figs that is failing  
  my ($ad,$msg)=&check_submission($response,$partid,$id,  
  $tag,$parstack,  
  $safeeval,1);  
  if ($sigline ne '') {  
     $error=&mt('Computer\'s answer is incorrect ("[_1]"). It is likely that the tolerance range [_2] or significant figures [_3] need to be adjusted.',$response,$tolline,$sigline);  
  } else {  
     $error=&mt('Computer\'s answer is incorrect ("[_1]"). It is likely that the tolerance range [_2] needs to be adjusted.',$response,$tolline);  
  }   }
    push(@fmt_ans,join(',',@$ans));
     }      }
       my $response=\@fmt_ans;
   
       my $hideunit=&Apache::lonnet::EXT('resource.'.$partid.'_'.
         $id.'.turnoffunit');
       if ($unit ne ''  && 
    ! ($Apache::lonhomework::type eq 'exam' ||
      lc($hideunit) eq "yes") )  {
    my $cleanunit=$unit;
    $cleanunit=~s/\$\,//g;
    foreach my $ans (@fmt_ans) {
       $ans.=" $cleanunit";
    }
       }
       my ($ad,$msg)=&check_submission($response,$partid,$id,$tag,
       $parstack,$safeeval);
     if ($ad ne 'EXACT_ANS' && $ad ne 'APPROX_ANS') {      if ($ad ne 'EXACT_ANS' && $ad ne 'APPROX_ANS') {
  &Apache::lonxml::error($error);   my $error;
     } else {   if ($tag eq 'formularesponse') {
  &Apache::lonxml::warning($error);      $error=&mt('Computer\'s answer is incorrect ("[_1]").',join(', ',@$response));
    } else {
       # answer failed check if it is sig figs that is failing
       my ($ad,$msg)=&check_submission($response,$partid,$id,
       $tag,$parstack,
       $safeeval,1);
       if ($sigline ne '') {
    $error=&mt('Computer\'s answer is incorrect ("[_1]"). It is likely that the tolerance range [_2] or significant figures [_3] need to be adjusted.',join(', ',@$response),$tolline,$sigline);
       } else {
    $error=&mt('Computer\'s answer is incorrect ("[_1]"). It is likely that the tolerance range [_2] needs to be adjusted.',join(', ',@$response),$tolline);
       }
    }
    if ($ad ne 'EXACT_ANS' && $ad ne 'APPROX_ANS') {
       &Apache::lonxml::error($error);
    } else {
       &Apache::lonxml::warning($error);
    }
     }      }
  }  
   
  if (defined($unit) and ($unit ne '') and      if (defined($unit) and ($unit ne '') and
     $tag eq 'numericalresponse') {   $tag eq 'numericalresponse') {
     if ($target eq 'answer') {   if ($target eq 'answer') {
  if ($env{'form.answer_output_mode'} eq 'tex') {      if ($env{'form.answer_output_mode'} eq 'tex') {
     $result.=&Apache::response::answer_part($tag,   $result.=&Apache::response::answer_part($tag,
     " Unit: $unit ");   " Unit: $unit ");
  } else {      } else {
     $result.=&Apache::response::answer_part($tag,   $result.=&Apache::response::answer_part($tag,
     "Unit: <b>$unit</b>");   "Unit: <b>$unit</b>");
       }
    } elsif ($target eq 'analyze') {
       push (@{ $Apache::lonhomework::analyze{"$part_id.unit"} }, $unit);
  }   }
     } elsif ($target eq 'analyze') {  
  push (@{ $Apache::lonhomework::analyze{"$part_id.unit"} }, $unit);  
     }      }
  }      if ($tag eq 'formularesponse' && $target eq 'answer') {
  if ($tag eq 'formularesponse' && $target eq 'answer') {   my $samples=&Apache::lonxml::get_param('samples',$parstack,$safeeval);
     my $samples=&Apache::lonxml::get_param('samples',$parstack,$safeeval);   $result.=&Apache::response::answer_part($tag,$samples);
     $result.=&Apache::response::answer_part($tag,$samples);      }
       $result.=&Apache::response::next_answer($tag,$name);
  }   }
  if ($target eq 'answer') {   if ($target eq 'answer') {
     $result.=&Apache::response::answer_footer($tag);      $result.=&Apache::response::answer_footer($tag);
Line 556  sub end_numericalresponse { Line 785  sub end_numericalresponse {
  $target eq 'tex' || $target eq 'analyze') {   $target eq 'tex' || $target eq 'analyze') {
  &Apache::lonxml::increment_counter($increment);   &Apache::lonxml::increment_counter($increment);
     }      }
     &Apache::response::end_response;      &Apache::response::end_response();
     return $result;      return $result;
 }  }
   
   sub format_prior_response_numerical {
       my ($mode,$answer) = @_;
       if (ref($answer)) {
    my $result = '<table class="LC_prior_numerical"><tr>';
    foreach my $element (@{ $answer }) {
       $result.= '<td><span class="LC_prior_numerical">'.
    &HTML::Entities::encode($element,'"<>&').'</span></td>';
    }
    $result.='</tr></table>';
    return $result;
       }
       return '<span class="LC_prior_numerical">'.
       &HTML::Entities::encode($answer,'"<>&').'</span>';
   
   }
   
   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.",
    '<tt>'.join(', ',@{$counts{$count}}).'</tt>',
    $count);
    } (sort(keys(%counts))));
    &Apache::lonxml::error(&mt("All answers must have the same number of components. Varying numbers of answers were seen. ").$counts);
       }
       my $expected_number_of_inputs = (keys(%counts))[0];
       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)));
       }
   }
   
 sub get_table_sizes {  sub get_table_sizes {
     my ($number_of_bubbles,$rbubble_values)=@_;      my ($number_of_bubbles,$rbubble_values)=@_;
     my $scale=2; #mm for one digit      my $scale=2; #mm for one digit
Line 624  sub format_number { Line 894  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);
   
     my ($format)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);      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,      my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,
    $safeeval);     $safeeval);
     if ($#incorrect eq 0) { @incorrect=(split(/,/,$incorrect[0])); }      if ($#incorrect eq 0) { @incorrect=(split(/,/,$incorrect[0])); }
Line 711  sub get_tolrange { Line 997  sub get_tolrange {
   
 sub get_sigrange {  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 (lc($env{"course.$courseid.disablesigfigs"}) eq 'yes') {
  return (15,0);   return (15,0);
Line 742  sub get_sigrange { Line 1028  sub get_sigrange {
     return ($sig_ubound,$sig_lbound);      return ($sig_ubound,$sig_lbound);
 }  }
   
   sub format_prior_response_string {
       my ($mode,$answer) =@_;
       return '<span class="LC_prior_string">'.
       &HTML::Entities::encode($answer,'"<>&').'</span>';
   }
   
 sub start_stringresponse {  sub start_stringresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      my $result;
Line 775  sub start_stringresponse { Line 1067  sub start_stringresponse {
  $answer=   $answer=
     &Apache::lonxml::get_param('answer',$parstack,$safeeval);      &Apache::lonxml::get_param('answer',$parstack,$safeeval);
     }      }
     $Apache::inputtags::answertxt{$id}=$answer;      $Apache::inputtags::answertxt{$id}=[$answer];
  }    } 
     } elsif ($target eq 'answer' || $target eq 'grade') {      } elsif ($target eq 'answer' || $target eq 'grade') {
  &Apache::response::reset_params();   &Apache::response::reset_params();
Line 826  sub end_stringresponse { Line 1118  sub end_stringresponse {
     &Apache::lonxml::debug("current $answer");      &Apache::lonxml::debug("current $answer");
     $ad = ($result) ? 'APPROX_ANS' : 'INCORRECT';      $ad = ($result) ? 'APPROX_ANS' : 'INCORRECT';
  } else {   } else {
     my $args_ref=       my @args = ('type');
  \%{$safeeval->varglob('LONCAPA::CAPAresponse_args')};      my $args_ref = &setup_capa_args($safeeval,$parstack,
       \@args,$response);
     $$args_ref{'response'}=$response;  
     &Apache::lonxml::debug("current $response");      &add_in_tag_answer($parstack,$safeeval);
     $$args_ref{'type'}=      my (@final_awards,@final_msgs,@names);
  &Apache::lonxml::get_param('type',$parstack,$safeeval);      foreach my $name (keys(%answer)) {
     foreach my $key (keys(%Apache::inputtags::params)) {   &Apache::lonxml::debug(" doing $name with ".join(':',@{ $answer{$name}{'answers'} }));
  $$args_ref{$key}=$Apache::inputtags::params{$key};   ${$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=dclone($answer{$name});
    my ($result, @msgs)=&Apache::run::run("&caparesponse_check_list()",$safeeval);
    &Apache::lonxml::debug('msgs are'.join(':',@msgs));
    my ($awards)=split(/:/,$result);
    my (@awards) = split(/,/,$awards);
    ($ad,$msg) = 
       &Apache::inputtags::finalizeawards(\@awards,\@msgs);
    push(@final_awards,$ad);
    push(@final_msgs,$msg);
    push(@names,$name);
    &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
     }      }
     &Apache::lonxml::debug('answer is'.join(':',$answer));      my ($ad, $msg, $name) = 
     @{$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=($answer);   &Apache::inputtags::finalizeawards(\@final_awards,
     ($result, my @msgs)=&Apache::run::run("&caparesponse_check_list()",$safeeval);     \@final_msgs,
     &Apache::lonxml::debug('msgs are'.join(':',@msgs));     \@names,1);
     my ($awards)=split(/:/,$result);  
     my (@awards) = split(/,/,$awards);  
     ($ad,$msg) = &Apache::inputtags::finalizeawards(\@awards,\@msgs);  
     &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");  
  }   }
  if ($Apache::lonhomework::type eq 'survey' &&   if ($Apache::lonhomework::type eq 'survey' &&
     ($ad eq 'INCORRECT' || $ad eq 'APPROX_ANS' ||      ($ad eq 'INCORRECT' || $ad eq 'APPROX_ANS' ||
Line 856  sub end_stringresponse { Line 1154  sub end_stringresponse {
     }      }
  }   }
     } elsif ($target eq 'answer' || $target eq 'analyze') {      } elsif ($target eq 'answer' || $target eq 'analyze') {
    &add_in_tag_answer($parstack,$safeeval);
  if ($target eq 'analyze') {   if ($target eq 'analyze') {
     push (@{ $Apache::lonhomework::analyze{"parts"} },"$part.$id");      push (@{ $Apache::lonhomework::analyze{"parts"} },"$part.$id");
     $Apache::lonhomework::analyze{"$part.$id.type"} = 'stringresponse';      $Apache::lonhomework::analyze{"$part.$id.type"} = 'stringresponse';
Line 866  sub end_stringresponse { Line 1165  sub end_stringresponse {
  if ($target eq 'answer') {   if ($target eq 'answer') {
     $result.=&Apache::response::answer_header('stringresponse');      $result.=&Apache::response::answer_header('stringresponse');
  }   }
 # foreach my $ans (@answers) {   foreach my $name (keys(%answer)) {
     if ($target eq 'answer') {      my @answers = @{ $answer{$name}{'answers'} };
  $result.=&Apache::response::answer_part('stringresponse',$answer);      for (my $i=0;$i<=$#answers;$i++) {
  if ($type eq 're') {   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',      $result.=&Apache::response::answer_part('stringresponse',
     $answerdisplay);      $answerdisplay);
  }   }
     } elsif ($target eq 'analyze') {  
  push (@{ $Apache::lonhomework::analyze{"$part.$id.answer"} },  
       $answer);  
     }      }
 # }   }
  my $string='Case Insensitive';   my $string='Case Insensitive';
  if ($type eq 'mc') {   if ($type eq 'mc') {
     $string='Multiple Choice';      $string='Multiple Choice';
Line 905  sub end_stringresponse { Line 1211  sub end_stringresponse {
  }   }
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result.='</td></tr>'.&Apache::edit::end_table;   $result.='</td></tr>'.&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' ||       if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || 
  $target eq 'tex' || $target eq 'analyze') {   $target eq 'tex' || $target eq 'analyze') {
Removed from v.1.192  
changed lines
  Added in v.1.215

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