[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.125 and 1.145

version 1.125, 2003/12/11 23:39:54 version 1.145, 2004/06/02 21:23:21
Line 29 Line 29
 package Apache::caparesponse;  package Apache::caparesponse;
 use strict;  use strict;
 use capa;  use capa;
   use Apache::lonlocal;
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse','stringresponse','formularesponse'));      &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse','stringresponse','formularesponse'));
Line 38  sub start_numericalresponse { Line 39  sub start_numericalresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $id = &Apache::response::start_response($parstack,$safeeval);      my $id = &Apache::response::start_response($parstack,$safeeval);
     my $result;      my $result;
       undef %{$safeeval->varglob('LONCAPA::CAPAresponse_args')};
     if ($target eq 'edit') {      if ($target eq 'edit') {
  $result.=&Apache::edit::tag_start($target,$token);   $result.=&Apache::edit::tag_start($target,$token);
  $result.=&Apache::edit::text_arg('Answer:','answer',$token);   $result.=&Apache::edit::text_arg('Answer:','answer',$token);
Line 98  sub end_numericalresponse { Line 100  sub end_numericalresponse {
     my $tag;      my $tag;
     if (scalar(@$tagstack)) { $tag=$$tagstack[-1]; }      if (scalar(@$tagstack)) { $tag=$$tagstack[-1]; }
     if ( $target eq 'grade' && defined($ENV{'form.submitted'})) {      if ( $target eq 'grade' && defined($ENV{'form.submitted'})) {
  &Apache::response::setup_params($tag);   &Apache::response::setup_params($tag,$safeeval);
  $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);   $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
  my $partid = $Apache::inputtags::part;   my $partid = $Apache::inputtags::part;
  my $id = $Apache::inputtags::response['-1'];   my $id = $Apache::inputtags::response['-1'];
Line 121  sub end_numericalresponse { Line 123  sub end_numericalresponse {
     my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval);      my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval);
     my @values=&make_numerical_bubbles($number_of_bubbles,$target,$answers[0],$formats[0],\@incorrect);      my @values=&make_numerical_bubbles($number_of_bubbles,$target,$answers[0],$formats[0],\@incorrect);
     $response=$values[$response];      $response=$values[$response];
  } else {  
     $response =~ s/\\/\\\\/g;  
     $response =~ s/\'/\\\'/g;  
  }   }
  $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;   $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
  &Apache::lonxml::debug("current $response");   my $args_ref= \%{$safeeval->varglob('LONCAPA::CAPAresponse_args')};
  my $expression="&caparesponse_check_list('".$response."','".   $$args_ref{'response'}=$response;
     $$parstack[-1];  
  my $hideunit=&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffunit');   my $hideunit=&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffunit');
   
    foreach my $arg ('type','tol','sig','ans_fmt','unit','calc',
    'samples') {
       $$args_ref{$arg}=
    &Apache::lonxml::get_param($arg,$parstack,$safeeval);
    }
  foreach my $key (keys(%Apache::inputtags::params)) {   foreach my $key (keys(%Apache::inputtags::params)) {
     $expression.= ';my $'. #'      $$args_ref{$key}=$Apache::inputtags::params{$key};
  $key.'="'.$Apache::inputtags::params{$key}.'"';  
  }   }
   
  #no way to enter units, with radio buttons   #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") {
     $expression.=';my $unit=undef;';      delete($$args_ref{'unit'});
  }   }
  #sig fig don't make much sense either   #sig fig don't make much sense either
  if (($Apache::lonhomework::type eq 'exam' ||   if (($Apache::lonhomework::type eq 'exam' ||
      $ENV{'form.submitted'} eq 'scantron') &&       $ENV{'form.submitted'} eq 'scantron') &&
     $tag eq 'numericalresponse') {      $tag eq 'numericalresponse') {
     $expression.=';my $sig=undef;';      delete($$args_ref{'sig'});
  }   }
   
  if ($tag eq 'formularesponse') {   if ($tag eq 'formularesponse') {
     $expression.=';my $type="fml";';      $$args_ref{'type'}='fml';
  } elsif ($tag eq 'numericalresponse') {   } elsif ($tag eq 'numericalresponse') {
     $expression.=';my $type="float";';      $$args_ref{'type'}='float';
  }   }
  $expression.="');";  
  my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);   my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
  &Apache::lonxml::debug('answer is'.join(':',@answer));   &Apache::lonxml::debug('answer is'.join(':',@answer));
  @{$safeeval->varglob('CAPARESPONSE_CHECK_LIST_answer')}=@answer;   @{$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=@answer;
   
  $result = &Apache::run::run($expression,$safeeval);   ($result,my @msgs) = 
  my ($awards) = split /:/ , $result;      &Apache::run::run("&caparesponse_check_list()",$safeeval);
  ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);   &Apache::lonxml::debug('msgs are'.join(':',@msgs));
  &Apache::lonxml::debug("$expression");   my ($awards)=split(/:/,$result);
    my (@awards) = split(/,/,$awards);
    ($ad,my $msg) = &Apache::inputtags::finalizeawards(\@awards,\@msgs);
    &Apache::lonxml::debug('ad is'.$ad);
    if ($ad eq 'SIG_FAIL') {
       my ($sig_u,$sig_l)=
    &get_sigrange($Apache::inputtags::params{'sig'});
       $msg=join(':',$msg,$sig_l,$sig_u);
       &Apache::lonxml::debug("sigs bad $sig_u $sig_l ".
      $Apache::inputtags::params{'sig'});
    }
  &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");   &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
  &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;
  $result='';   $result='';
     }      }
  }   }
Line 179  sub end_numericalresponse { Line 191  sub end_numericalresponse {
     my $unit=&Apache::lonxml::get_param_var('unit',$parstack,      my $unit=&Apache::lonxml::get_param_var('unit',$parstack,
     $safeeval);      $safeeval);
     if ($target eq 'web') {      if ($target eq 'web') {
  $result="<br />The correct answer is ";   $result="<br />".&mt('The correct answer is')." ";
     }      }
     for (my $i=0; $i <= $#answers; $i++) {      for (my $i=0; $i <= $#answers; $i++) {
  my $answer=$answers[$i];   my $answer=$answers[$i];
Line 213  sub end_numericalresponse { Line 225  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 $number_of_bubbles = &Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.numbubbles');      my $number_of_bubbles = &Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.numbubbles');
       if ($Apache::inputtags::params{'numbubbles'}) {
    $number_of_bubbles = $Apache::inputtags::params{'numbubbles'};
       }
     if (!$number_of_bubbles) { $number_of_bubbles=8; }      if (!$number_of_bubbles) { $number_of_bubbles=8; }
       
     my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,      my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,
  $safeeval);   $safeeval);
     my $unit=&Apache::lonxml::get_param_var('unit',$parstack,      my $unit=&Apache::lonxml::get_param_var('unit',$parstack,
Line 250  sub end_numericalresponse { Line 266  sub end_numericalresponse {
  }   }
  if ($tag eq 'numericalresponse') {   if ($tag eq 'numericalresponse') {
     my ($celllength,$number_of_tables,@table_range)=      my ($celllength,$number_of_tables,@table_range)=
  &get_table_sizes($formats[0],$number_of_bubbles);   &get_table_sizes($number_of_bubbles,\@bubble_values);
     my $j=0;      my $j=0;
     my $cou=0;      my $cou=0;
     $result.='\vskip -1 mm \noindent \begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]';      $result.='\vskip -1 mm \noindent \begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]';
     for (my $i=0;$i<$number_of_tables;$i++) {      for (my $i=0;$i<$number_of_tables;$i++) {
  $result.='\vskip -1 mm \noindent \begin{tabular}{';   $result.='\vskip -1 mm \noindent \setlength{\tabcolsep}{2 mm}\begin{tabular}{';
  for (my $ind=0;$ind<$table_range[$j];$ind++) {   for (my $ind=0;$ind<$table_range[$j];$ind++) {
     $result.='lp{'.$celllength.' mm}';      $result.='p{3 mm}p{'.$celllength.' mm}';
  }   }
  $result.='}';   $result.='}';
  for (my $ind=$cou;$ind<$cou+$table_range[$j];$ind++) {   for (my $ind=$cou;$ind<$cou+$table_range[$j];$ind++) {
     $result.='\hskip -3 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -2 mm & {\small '.$bubble_values[$ind].'} ';      $result.='\hskip -4 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$ & \hskip -3 mm {\small '.$bubble_values[$ind].'} ';
     if ($ind != $cou+$table_range[$j]-1) {$result.=' & ';}      if ($ind != $cou+$table_range[$j]-1) {$result.=' & ';}
  }   }
  $cou += $table_range[$j];   $cou += $table_range[$j];
Line 293  sub end_numericalresponse { Line 309  sub end_numericalresponse {
     push (@{ $Apache::lonhomework::analyze{"$part_id.incorrect"} }, @incorrect);      push (@{ $Apache::lonhomework::analyze{"$part_id.incorrect"} }, @incorrect);
  }   }
  if (scalar(@$tagstack)) {   if (scalar(@$tagstack)) {
     &Apache::response::setup_params($tag);      &Apache::response::setup_params($tag,$safeeval);
  }   }
  my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);   my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
  my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);   my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);
Line 325  sub end_numericalresponse { Line 341  sub end_numericalresponse {
     }      }
     if ($target eq 'answer') {      if ($target eq 'answer') {
  if ($high && $tag eq 'numericalresponse') { $ans.=' ['.$low.','.$high.']'; }   if ($high && $tag eq 'numericalresponse') { $ans.=' ['.$low.','.$high.']'; }
  if ($sighigh && $tag eq 'numericalresponse') {   if (defined($sighigh) && $tag eq 'numericalresponse') {
     if ($ENV{'form.answer_output_mode'} eq 'tex') {      if ($ENV{'form.answer_output_mode'} eq 'tex') {
  $ans.= " Sig $siglow - $sighigh";   $ans.= " Sig $siglow - $sighigh";
     } else {      } else {
Line 372  sub end_numericalresponse { Line 388  sub end_numericalresponse {
 }  }
   
 sub get_table_sizes {  sub get_table_sizes {
     my ($format,$number_of_bubbles)=@_;      my ($number_of_bubbles,$rbubble_values)=@_;
     my $max_val = 0;      my $scale=2; #mm for one digit
     if ($format=~m/^(\d+)E([^\d]*)(\d*)$/) {      my $cell_width=0;
  $max_val=$1+$2+4;      foreach my $member (@$rbubble_values) {
    my $cell_width_real=0;
    if ($member=~/(\+|-)?(\d*)\.?(\d*)\s*\$\\times\s*10\^{(\+|-)?(\d+)}\$/) {
       $cell_width_real=(length($2)+length($3)+length($5)+7)*$scale;
    } elsif ($member=~/(\d*)\.?(\d*)(E|e)(\+|-)?(\d*)/) {
       $cell_width_real=(length($1)+length($2)+length($5)+9)*$scale;
           } elsif ($member=~/(\d*)\.(\d*)/) {
       $cell_width_real=(length($1)+length($2)+3)*$scale;
    } else {
       $cell_width_real=(length($member)+1)*$scale*0.9;
    }
    if ($cell_width_real>$cell_width) {$cell_width=$cell_width_real;}
       }
       $cell_width+=8; 
       my $textwidth;
       if ($ENV{'form.textwidth'} ne '') {
    $ENV{'form.textwidth'}=~/(\d*)\.?(\d*)/;
    $textwidth=$1.'.'.$2;
     } else {      } else {
  $max_val=4;   $ENV{'textwidth'}=~/(\d+)\.?(\d*)/;
    $textwidth=$1.'.'.$2;
     }      }
     $max_val = int(0.9*$ENV{'form.textwidth'}/(($max_val+6)*2));      my $bubbles_per_line=int($textwidth/$cell_width);
     my $celllength = 0.9*$ENV{'form.textwidth'}/$max_val-10;      if (($bubbles_per_line > $number_of_bubbles/2) && ($number_of_bubbles % 2==0)) {$bubbles_per_line=$number_of_bubbles/2;}
       my $number_of_tables = int($number_of_bubbles/$bubbles_per_line);
     my @table_range = ();      my @table_range = ();
     my $number_of_tables = int($number_of_bubbles/$max_val);      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,$max_val;}      if ($number_of_bubbles % $bubbles_per_line) {
     if ($number_of_bubbles % $max_val != 0) {  
  $number_of_tables++;   $number_of_tables++;
  push @table_range,($number_of_bubbles % $max_val);   push @table_range,($number_of_bubbles % $bubbles_per_line);
     }      }
     return ($celllength,$number_of_tables,@table_range);      $cell_width-=8;
       $cell_width=$cell_width*3/4;
       return ($cell_width,$number_of_tables,@table_range);
 }  }
   
 sub format_number {  sub format_number {
Line 428  sub make_numerical_bubbles { Line 464  sub make_numerical_bubbles {
     my @oldseed=&Math::Random::random_get_seed();      my @oldseed=&Math::Random::random_get_seed();
     if (defined($incorrect) && ref($incorrect)) {      if (defined($incorrect) && ref($incorrect)) {
  &Apache::lonxml::debug("inside ".(scalar(@$incorrect)+1 gt $number_of_bubbles));   &Apache::lonxml::debug("inside ".(scalar(@$incorrect)+1 gt $number_of_bubbles));
  if (scalar(@$incorrect)+1 >= $number_of_bubbles) {   if (defined($$incorrect[0]) &&
       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);
Line 436  sub make_numerical_bubbles { Line 473  sub make_numerical_bubbles {
     @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.": whih are :".join(':',@bubble_values));
     &Math::Random::random_set_seed(@oldseed);      &Math::Random::random_set_seed(@oldseed);
       if (defined($format) && $format ne '') {
    foreach my $value (@bubble_values) {
       $value=&format_number($value,$format,$target);
    }
       }
     return @bubble_values;      return @bubble_values;
  }   }
  #FIXME what to do when not enough incorrects specified?   if (defined($$incorrect[0]) &&
       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.");
    }
     }      }
     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
     my @powers = (1.0,2.0,3.0,4.0,5.0,6.0,7.0,8.0); #default values for powers      my @powers = (1..$number_of_bubbles);
     &Apache::response::setrandomnumber();      &Apache::response::setrandomnumber();
     my $ind=&Math::Random::random_uniform_integer(1,0,$#powers);      my $ind=&Math::Random::random_uniform_integer(1,0,$#powers);
     my $power = $powers[$ind];      my $power = $powers[$ind];
Line 482  sub get_sigrange { Line 527  sub get_sigrange {
  $sig_ubound =15; #SIG_UB_DEFAULT   $sig_ubound =15; #SIG_UB_DEFAULT
     } else {      } else {
  ($sig_lbound,$sig_ubound) = split(/,/,$sig);   ($sig_lbound,$sig_ubound) = split(/,/,$sig);
  if (!$sig_lbound) {   if (!defined($sig_lbound)) {
     $sig_lbound = 0; #SIG_LB_DEFAULT      $sig_lbound = 0; #SIG_LB_DEFAULT
     $sig_ubound =15; #SIG_UB_DEFAULT      $sig_ubound =15; #SIG_UB_DEFAULT
  }   }
  if (!$sig_ubound) { $sig_ubound=$sig_lbound; }   if (!defined($sig_ubound)) { $sig_ubound=$sig_lbound; }
       }
       if (($sig_ubound<$sig_lbound) ||
    ($sig_lbound > 15) ||
    ($sig =~/(\+|-)/ ) ) {
    my $errormsg=&mt("Invalid Significant figures detected")." ($sig)";
    if ($ENV{'request.state'} eq 'construct') {
       $errormsg.=
    &Apache::loncommon::help_open_topic('Significant_Figures');
    }
    &Apache::lonxml::error($errormsg);
     }      }
     return ($sig_ubound,$sig_lbound);      return ($sig_ubound,$sig_lbound);
 }  }
Line 506  sub start_stringresponse { Line 561  sub start_stringresponse {
  [['cs','Case Sensitive'],['ci','Case Insensitive'],   [['cs','Case Sensitive'],['ci','Case Insensitive'],
   ['mc','Case Insensitive, Any Order'],    ['mc','Case Insensitive, Any Order'],
   ['re','Regular Expression']],$token);    ['re','Regular Expression']],$token);
    $result.=&Apache::edit::checked_arg('Answer Display:','answerdisplay',
       [['inline','Inline']],$token);
  $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();   $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  my $constructtag;         my $constructtag;
  $constructtag=&Apache::edit::get_new_args($token,$parstack,         $constructtag=&Apache::edit::get_new_args($token,$parstack,
   $safeeval,'answer',                                                   $safeeval,'answer',
   'type');                                                   'type','answerdisplay');
  if ($constructtag) {         if ($constructtag) {
     $result = &Apache::edit::rebuild_tag($token);             $result = &Apache::edit::rebuild_tag($token);
     $result.=&Apache::edit::handle_insert();             $result.=&Apache::edit::handle_insert();
  }         }
     } elsif ($target eq 'answer' || $target eq 'grade') {      } elsif ($target eq 'answer' || $target eq 'grade') {
  &Apache::response::reset_params();   &Apache::response::reset_params();
     }      }
Line 530  sub end_stringresponse { Line 587  sub end_stringresponse {
     my $id=$Apache::inputtags::response[-1];      my $id=$Apache::inputtags::response[-1];
     my $answer=&Apache::lonxml::get_param('answer',$parstack,$safeeval);      my $answer=&Apache::lonxml::get_param('answer',$parstack,$safeeval);
     my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval);      my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval);
       my $answerdisplay=&Apache::lonxml::get_param('answerdisplay',$parstack,$safeeval);
     &Apache::lonxml::debug("current $answer ".$token->[2]);      &Apache::lonxml::debug("current $answer ".$token->[2]);
     if (!$Apache::lonxml::default_homework_loaded) {      if (!$Apache::lonxml::default_homework_loaded) {
  &Apache::lonxml::default_homework_load($safeeval);   &Apache::lonxml::default_homework_load($safeeval);
     }      }
     if ( $target eq 'grade' && defined($ENV{'form.submitted'})) {      if ( $target eq 'grade' && defined($ENV{'form.submitted'})) {
  &Apache::response::setup_params('stringresponse');   &Apache::response::setup_params('stringresponse',$safeeval);
  $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' ||
     $ENV{'form.submitted'} eq 'scantron') {      $ENV{'form.submitted'} eq 'scantron') {
Line 547  sub end_stringresponse { Line 605  sub end_stringresponse {
     $part,$id);      $part,$id);
  &Apache::lonxml::debug("submitted a $response<br>\n");   &Apache::lonxml::debug("submitted a $response<br>\n");
  &Apache::lonxml::debug($$parstack[-1] . "\n<br>");   &Apache::lonxml::debug($$parstack[-1] . "\n<br>");
   
  $Apache::lonhomework::results{"resource.$part.$id.submission"}=   $Apache::lonhomework::results{"resource.$part.$id.submission"}=
     $response;      $response;
  my $ad;   my ($ad,$msg);
  if ($type eq 're' ) {    if ($type eq 're' ) { 
     # if the RE wasn't in a var it likely got munged,      # if the RE wasn't in a var it likely got munged,
                     # thus grab it from the var directly                      # thus grab it from the var directly
Line 558  sub end_stringresponse { Line 615  sub end_stringresponse {
 #    if ($testans !~ m/^\s*\$/) {  #    if ($testans !~ m/^\s*\$/) {
 # $answer=$token->[2]->{'answer'};  # $answer=$token->[2]->{'answer'};
 #    }  #    }
     ${$safeeval->varglob('LONCAPA_INTERNAL_response')}=      ${$safeeval->varglob('LONCAPA::response')}=$response;
  $response;      $result = &Apache::run::run('return $LONCAPA::response=~m'.$answer,$safeeval);
     $result = &Apache::run::run('return $LONCAPA_INTERNAL_response=~m'.$answer,$safeeval);  
     &Apache::lonxml::debug("current $response");      &Apache::lonxml::debug("current $response");
     &Apache::lonxml::debug("current $answer");      &Apache::lonxml::debug("current $answer");
     $ad = ($result) ? 'APPROX_ANS' : 'INCORRECT';      $ad = ($result) ? 'APPROX_ANS' : 'INCORRECT';
  } else {   } else {
     $response =~ s/\\/\\\\/g;      my $args_ref= 
     $response =~ s/\'/\\\'/g;   \%{$safeeval->varglob('LONCAPA::CAPAresponse_args')};
   
       $$args_ref{'response'}=$response;
     &Apache::lonxml::debug("current $response");      &Apache::lonxml::debug("current $response");
     my $expression="&caparesponse_check_list('".$response."','".      $$args_ref{'type'}=
  $$parstack[-1];   &Apache::lonxml::get_param('type',$parstack,$safeeval);
     foreach my $key (keys(%Apache::inputtags::params)) {      foreach my $key (keys(%Apache::inputtags::params)) {
  $expression.= ';my $'. #'   $$args_ref{$key}=$Apache::inputtags::params{$key};
     $key.'="'.$Apache::inputtags::params{$key}.'"';  
     }      }
     $expression.="');";  
     &Apache::lonxml::debug('answer is'.join(':',$answer));      &Apache::lonxml::debug('answer is'.join(':',$answer));
     @{$safeeval->varglob('CAPARESPONSE_CHECK_LIST_answer')}=($answer);      @{$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=($answer);
     $result = &Apache::run::run($expression,$safeeval);      ($result, my @msgs)=&Apache::run::run("&caparesponse_check_list()",$safeeval);
     my ($awards) = split /:/ , $result;      &Apache::lonxml::debug('msgs are'.join(':',@msgs));
     ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);      my ($awards)=split(/:/,$result);
     &Apache::lonxml::debug("$expression");      my (@awards) = split(/,/,$awards);
       ($ad,$msg) = &Apache::inputtags::finalizeawards(\@awards,\@msgs);
     &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");      &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
  }   }
  &Apache::response::handle_previous(\%previous,$ad);   &Apache::response::handle_previous(\%previous,$ad);
  $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad;   $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad;
    $Apache::lonhomework::results{"resource.$part.$id.awardmsg"}=$msg;
     }      }
  }   }
     } elsif ($target eq 'web' || $target eq 'tex') {      } elsif ($target eq 'web' || $target eq 'tex') {
Line 592  sub end_stringresponse { Line 650  sub end_stringresponse {
  my $status = $Apache::inputtags::status['-1'];   my $status = $Apache::inputtags::status['-1'];
  if (  &Apache::response::show_answer() ) {   if (  &Apache::response::show_answer() ) {
     if ($target eq 'web') {      if ($target eq 'web') {
  $result="<br />The correct answer is ".$answer;   $result=($answerdisplay eq 'inline'?'':"<br />".&mt('The correct answer is')." ")
       .$answer;
 #    join(', ',@answers).".<br />";  #    join(', ',@answers).".<br />";
     }      }
  }   }
Line 611  sub end_stringresponse { Line 670  sub end_stringresponse {
     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';
  }   }
  &Apache::response::setup_params('stringresponse');   &Apache::response::setup_params('stringresponse',$safeeval);
  if ($target eq 'answer') {   if ($target eq 'answer') {
     $result.=&Apache::response::answer_header('stringresponse');      $result.=&Apache::response::answer_header('stringresponse');
  }   }
Removed from v.1.125  
changed lines
  Added in v.1.145

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