[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.181 and 1.202

version 1.181, 2005/11/16 22:52:31 version 1.202, 2006/12/15 22:11:43
Line 29 Line 29
 package Apache::caparesponse;  package Apache::caparesponse;
 use strict;  use strict;
 use capa;  use capa;
   use Safe::Hole;
   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 $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 63  sub end_answer { Line 69  sub end_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];  
     my $dis = &Apache::lonxml::get_param('answerdisplay',$parstack,$safeeval);  
     if (defined($dis)) { $Apache::inputtags::answertxt{$id}=$dis; }  
     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);
    }
       }
     return $result;      return $result;
 }  }
   
 sub start_value {  sub start_value {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      my $result;
     if ( $target eq 'web' || $target eq 'tex' ||      if ( $target eq 'web' || $target eq 'tex' ||
  $target eq 'grade' || $target eq 'webgrade' ||   $target eq 'grade' || $target eq 'webgrade' ||
  $target eq 'answer' || $target eq 'analyze' ) {   $target eq 'answer' || $target eq 'analyze' ) {
  my $bodytext = &Apache::lonxml::get_all_text("/value",$parser);   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]);
   
     }      }
     return $result;      return $result;
 }  }
Line 95  sub end_value { Line 109  sub end_value {
     return $result;      return $result;
 }  }
   
 sub start_array {  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);
       }
       return $result;
   }
   
   sub end_vector {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;      my $result;
       return $result;
   }
   
   sub start_array {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       my $result;
     if ( $target eq 'web' || $target eq 'tex' ||      if ( $target eq 'web' || $target eq 'tex' ||
  $target eq 'grade' || $target eq 'webgrade' ||   $target eq 'grade' || $target eq 'webgrade' ||
  $target eq 'answer' || $target eq 'analyze' ) {   $target eq 'answer' || $target eq 'analyze' ) {
  my $bodytext = &Apache::lonxml::get_all_text("/value",$parser);   my $bodytext = &Apache::lonxml::get_all_text("/array",$parser,$style);
  my @values = &Apache::run::evaluate($bodytext,$safeeval,   my @values = &Apache::run::evaluate($bodytext,$safeeval,
     $$parstack[-1]);      $$parstack[-1]);
  push(@{ $answer{$cur_name}{'answers'} },@values);   push(@{ $answer{$cur_name}{'answers'} },@values);
Line 129  sub end_unit { Line 165  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'));
     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 182  sub start_numericalresponse { Line 220  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,
    $response_level) = @_;
       &add_in_tag_answer($parstack,$safeeval,$response_level);
   
       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;   my $format;
  if ($#formats > 0) {   if ($#formats > 0) {
     $format=$formats[$i];      $format=$formats[$i];
Line 199  sub start_numericalresponse { Line 257  sub start_numericalresponse {
  }   }
  if ($unit=~/\$/) { $format="\$".$format; $unit=~s/\$//g; }   if ($unit=~/\$/) { $format="\$".$format; $unit=~s/\$//g; }
  if ($unit=~/\,/) { $format="\,".$format; $unit=~s/\,//g; }   if ($unit=~/\,/) { $format="\,".$format; $unit=~s/\,//g; }
  my $formatted=&format_number($answer,$format,$target,   my $formatted=&format_number($element,$format,$target,
      $safeeval);       $safeeval);
  $answertxt.=$formatted.',';   $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);
       return $args_ref;
   }
   
   sub setup_capa_response {
       my ($args_ref,$response) = @_;   
   
       use Data::Dumper;
       &Apache::lonxml::debug("response dump is ".&Dumper($response));
           
     #no way to enter units, with radio buttons      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 242  sub check_submission { Line 325  sub check_submission {
     }      }
           
     if ($tag eq 'formularesponse') {      if ($tag eq 'formularesponse') {
  $$args_ref{'type'}='fml';   if ($$args_ref{'samples'}) {
       $$args_ref{'type'}='fml';
    } else {
       $$args_ref{'type'}='math';
    }
     } 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 272  sub check_submission { Line 358  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 && defined($answer[0])) {
    $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 {
Line 285  sub end_numericalresponse { Line 388  sub end_numericalresponse {
     my $partid = $Apache::inputtags::part;      my $partid = $Apache::inputtags::part;
     my $id = $Apache::inputtags::response[-1];      my $id = $Apache::inputtags::response[-1];
     my $tag;      my $tag;
       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');
       $safehole->wrap(\&Apache::lonmaxima::maxima_cas_formula_fix,$safeeval,'&maxima_cas_formula_fix');
       $safehole->wrap(\&capa_formula_fix,$safeeval,'&capa_formula_fix');
   
     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() ) {
  &Apache::response::setup_params($tag,$safeeval);   &Apache::response::setup_params($tag,$safeeval);
  if ($Apache::lonhomework::type eq 'exam' &&    if ($Apache::lonhomework::type eq 'exam' && 
     $tag eq 'formularesponse') {      (($tag eq 'formularesponse') || ($tag eq 'mathresponse'))) {
     $increment=&Apache::response::scored_response($partid,$id);      $increment=&Apache::response::scored_response($partid,$id);
  } else {   } else {
     my $response = &Apache::response::getresponse();      my $response = &Apache::response::getresponse();
Line 300  sub end_numericalresponse { Line 408  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')) {
     my $number_of_bubbles = &Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.numbubbles');      my ($values,$display)=&make_numerical_bubbles($partid,$id,
     if (!$number_of_bubbles) { $number_of_bubbles=8; }    $target,$parstack,$safeeval);
     my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);  
     my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);  
     my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval);  
     if ($#incorrect eq 0) { @incorrect=(split(/,/,$incorrect[0])); }  
     my ($values,$display)=&make_numerical_bubbles($number_of_bubbles,$target,$answers[0],$formats[0],\@incorrect,$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 330  sub end_numericalresponse { Line 434  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') {
     my $number_of_bubbles = &Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.numbubbles');      # FIXME support multi dimensional numerical problems
     if ($Apache::inputtags::params{'numbubbles'}) {              #       in exam bubbles
  $number_of_bubbles = $Apache::inputtags::params{'numbubbles'};      my ($bubble_values,$bubble_display)=
     }   &make_numerical_bubbles($partid,$id,$target,$parstack,
     if (!$number_of_bubbles) { $number_of_bubbles=8; }   $safeeval);
           my $number_of_bubbles = scalar(@{ $bubble_values });
     my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,  
  $safeeval);  
     my $unit=&Apache::lonxml::get_param_var('unit',$parstack,      my $unit=&Apache::lonxml::get_param_var('unit',$parstack,
     $safeeval);      $safeeval);
     my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval);  
     if ($#incorrect eq 0) { @incorrect=(split(/,/,$incorrect[0])); }  
     my ($bubble_values,$bubble_display)=  
  &make_numerical_bubbles($number_of_bubbles,  
  $target,$answers[0],  
  $formats[0],\@incorrect,$safeeval);  
     my @alphabet=('A'..'Z');      my @alphabet=('A'..'Z');
     if ($target eq 'web') {      if ($target eq 'web') {
  if ($tag eq 'numericalresponse') {   if ($tag eq 'numericalresponse') {
Line 372  sub end_numericalresponse { Line 468  sub end_numericalresponse {
     $bubble_display->[$ind].'</td>';      $bubble_display->[$ind].'</td>';
     }      }
     $result.='</tr></table>';      $result.='</tr></table>';
  } elsif ($tag eq 'formularesponse') {  
     $result.= '<br /><br /><font color="red">  
                            <textarea name="HWVAL_'.$id.'" rows="4" cols="50">  
                            </textarea></font> <br /><br />';  
  }   }
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  if ((defined $unit) and ($unit=~/\S/) and ($Apache::lonhomework::type eq 'exam')) {   if ((defined $unit) and ($unit=~/\S/) and ($Apache::lonhomework::type eq 'exam')) {
Line 403  sub end_numericalresponse { Line 495  sub end_numericalresponse {
     }      }
     $result.='\end{enumerate}';      $result.='\end{enumerate}';
  } else {   } else {
     $result.='\fbox{\fbox{\parbox{\textwidth-5mm}{\strut\\\\\strut\\\\\strut\\\\\strut\\\\}}}';      $increment = &Apache::response::repetition();
     my $repetition = &Apache::response::repetition();  
     $result.='\begin{enumerate}';  
     for (my $i=0;$i<$repetition;$i++) {  
  $result.='\item[\textbf{'.($Apache::lonxml::counter+$i).'}.]\textit{Leave blank on scoring form}\vskip 0 mm';  
     }  
     $increment=$repetition;  
     $result.= '\end{enumerate}';  
  }   }
     }      }
  }   }
Line 430  sub end_numericalresponse { Line 515  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'
    && $Apache::lonhomework::type eq 'exam') {
    my ($bubble_values,undef,$correct) = &make_numerical_bubbles($partid,
        $id,$target,$parstack,$safeeval);
    $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]").');  
     } 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 562  sub end_numericalresponse { Line 685  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 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);
       }
       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)) {
    &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 613  sub format_number { Line 762  sub format_number {
     my $ans;      my $ans;
     if ($format eq '') {      if ($format eq '') {
  #What is the number? (integer,decimal,floating point)   #What is the number? (integer,decimal,floating point)
  if ($number=~/^(\d*\.?\d*)(E|e)(\d*)$/) {   if ($number=~/^(\d*\.?\d*)(E|e)[+\-]?(\d*)$/) {
     $format = '3e';      $format = '3e';
  } elsif ($number=~/^(\d*)\.(\d*)$/) {   } elsif ($number=~/^(\d*)\.(\d*)$/) {
     $format = '4f';      $format = '4f';
Line 629  sub format_number { Line 778  sub format_number {
 }  }
   
 sub make_numerical_bubbles {  sub make_numerical_bubbles {
     my ($number_of_bubbles,$target,$answer,$format,$incorrect,$safeeval) =@_;      my ($part,$id,$target,$parstack,$safeeval) =@_;
       
       my $number_of_bubbles = 
    &Apache::response::get_response_param($part.'_'.$id,'numbubbles',8);
   
       my ($format)=&Apache::lonxml::get_param_var('format',$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])); }
       
     my @bubble_values=();      my @bubble_values=();
     &Apache::lonxml::debug("answer is $answer incorrect is $incorrect");      my @alphabet=('A'..'Z');
   
       &Apache::lonxml::debug("answer is $answer incorrect is @incorrect");
     my @oldseed=&Math::Random::random_get_seed();      my @oldseed=&Math::Random::random_get_seed();
     if (defined($incorrect) && ref($incorrect)) {      if (@incorrect) {
  &Apache::lonxml::debug("inside ".(scalar(@$incorrect)+1 gt $number_of_bubbles));   &Apache::lonxml::debug("inside ".(scalar(@incorrect)+1 gt $number_of_bubbles));
  if (defined($$incorrect[0]) &&   if (defined($incorrect[0]) &&
     scalar(@$incorrect)+1 >= $number_of_bubbles) {      scalar(@incorrect)+1 >= $number_of_bubbles) {
     &Apache::lonxml::debug("inside ".(scalar(@$incorrect)+1).":$number_of_bubbles");      &Apache::lonxml::debug("inside ".(scalar(@incorrect)+1).":$number_of_bubbles");
     &Apache::response::setrandomnumber();      &Apache::response::setrandomnumber();
     my @rand_inc=&Math::Random::random_permutation(@$incorrect);      my @rand_inc=&Math::Random::random_permutation(@incorrect);
     @bubble_values=@rand_inc[0..($number_of_bubbles-2)];      @bubble_values=@rand_inc[0..($number_of_bubbles-2)];
     @bubble_values=sort {$a <=> $b} (@bubble_values,$answer);      @bubble_values=sort {$a <=> $b} (@bubble_values,$answer);
     &Apache::lonxml::debug("Answer was :$answer: returning :".$#bubble_values.": whih are :".join(':',@bubble_values));      &Apache::lonxml::debug("Answer was :$answer: returning :".$#bubble_values.": which are :".join(':',@bubble_values));
     &Math::Random::random_set_seed(@oldseed);      &Math::Random::random_set_seed(@oldseed);
   
       my $correct;
       for(my $i=0; $i<=$#bubble_values;$i++) {
    if ($bubble_values[$i] eq $answer) {
       $correct = $alphabet[$i];
       last;
    }
       }
   
     if (defined($format) && $format ne '') {      if (defined($format) && $format ne '') {
  my @bubble_display;   my @bubble_display;
  foreach my $value (@bubble_values) {   foreach my $value (@bubble_values) {
     push(@bubble_display,      push(@bubble_display,
  &format_number($value,$format,$target,$safeeval));   &format_number($value,$format,$target,$safeeval));
  }   }
  return (\@bubble_values,\@bubble_display);   return (\@bubble_values,\@bubble_display,$correct);
     } else {      } else {
  return (\@bubble_values,\@bubble_values);   return (\@bubble_values,\@bubble_values,$correct);
     }      }
  }   }
  if (defined($$incorrect[0]) &&   if (defined($incorrect[0]) &&
     scalar(@$incorrect)+1 < $number_of_bubbles) {      scalar(@incorrect)+1 < $number_of_bubbles) {
     &Apache::lonxml::warning("Not enough incorrect answers were specified in the incorrect array, ignoring the specified incorrect answers and instead generating them (".join(',',@$incorrect).").");      &Apache::lonxml::warning("Not enough incorrect answers were specified in the incorrect array, ignoring the specified incorrect answers and instead generating them (".join(',',@incorrect).").");
  }   }
     }      }
     my @factors = (1.13,1.17,1.25,1.33,1.45); #default values of factors      my @factors = (1.13,1.17,1.25,1.33,1.45); #default values of factors
Line 674  sub make_numerical_bubbles { Line 855  sub make_numerical_bubbles {
        $format,$target,$safeeval);         $format,$target,$safeeval);
   
     }      }
       my $correct = $alphabet[$number_of_bubbles-$power];
     &Math::Random::random_set_seed(@oldseed);      &Math::Random::random_set_seed(@oldseed);
     return (\@bubble_values,\@bubble_display);      return (\@bubble_values,\@bubble_display,$correct);
 }  }
   
 sub get_tolrange {  sub get_tolrange {
Line 695  sub get_tolrange { Line 877  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 759  sub start_stringresponse { Line 941  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 769  sub start_stringresponse { Line 951  sub start_stringresponse {
   
 sub end_stringresponse {  sub end_stringresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $increment=1;  
     my $result = '';      my $result = '';
     my $part=$Apache::inputtags::part;      my $part=$Apache::inputtags::part;
     my $id=$Apache::inputtags::response[-1];      my $id=$Apache::inputtags::response[-1];
Line 785  sub end_stringresponse { Line 967  sub end_stringresponse {
  $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);   $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
  if ($Apache::lonhomework::type eq 'exam' ||   if ($Apache::lonhomework::type eq 'exam' ||
     &Apache::response::submitted('scantron')) {      &Apache::response::submitted('scantron')) {
     $increment=&Apache::response::scored_response($part,$id);      &Apache::response::scored_response($part,$id);
   
  } else {   } else {
     my $response = &Apache::response::getresponse();      my $response = &Apache::response::getresponse();
     if ( $response =~ /[^\s]/) {      if ( $response =~ /[^\s]/) {
Line 809  sub end_stringresponse { Line 992  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 838  sub end_stringresponse { Line 1027  sub end_stringresponse {
  $Apache::lonhomework::results{"resource.$part.$id.awardmsg"}=$msg;   $Apache::lonhomework::results{"resource.$part.$id.awardmsg"}=$msg;
     }      }
  }   }
     } elsif ($target eq 'web' || $target eq 'tex') {  
  my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};  
  my $status = $Apache::inputtags::status['-1'];  
  if ($Apache::lonhomework::type eq 'exam' && $target eq 'tex') {  
     $result.='\fbox{\fbox{\parbox{\textwidth-5mm}{\strut\\\\\strut\\\\\strut\\\\\strut\\\\}}}';  
     $increment = &Apache::response::repetition();  
     $result.='\begin{enumerate}';  
     for (my $i=0;$i<$increment;$i++) {  
  $result.='\item[\textbf{'.($Apache::lonxml::counter+$i).  
     '}.]\textit{Leave blank on scoring form}\vskip 0 mm';  
     }  
     $result.= '\end{enumerate}';  
  }  
     } 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 862  sub end_stringresponse { Line 1039  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 904  sub end_stringresponse { Line 1088  sub end_stringresponse {
     }      }
     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') {
  &Apache::lonxml::increment_counter($increment);   &Apache::lonxml::increment_counter(&Apache::response::repetition());
     }      }
     &Apache::response::end_response;      &Apache::response::end_response;
     return $result;      return $result;
Removed from v.1.181  
changed lines
  Added in v.1.202

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