[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.183

version 1.181, 2005/11/16 22:52:31 version 1.183, 2005/12/01 22:30:55
Line 76  sub end_answergroup { Line 76  sub end_answergroup {
 }  }
   
 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);
Line 96  sub end_value { Line 96  sub end_value {
 }  }
   
 sub start_array {  sub start_array {
     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("/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 517  sub end_numericalresponse { Line 517  sub end_numericalresponse {
  if ($ad ne 'EXACT_ANS' && $ad ne 'APPROX_ANS') {   if ($ad ne 'EXACT_ANS' && $ad ne 'APPROX_ANS') {
     my $error;      my $error;
     if ($tag eq 'formularesponse') {      if ($tag eq 'formularesponse') {
  $error=&mt('Computer\'s answer is incorrect ("[_1]").');   $error=&mt('Computer\'s answer is incorrect ("[_1]").',$response);
     } else {      } else {
  # answer failed check if it is sig figs that is failing   # answer failed check if it is sig figs that is failing
  my ($ad,$msg)=&check_submission($response,$partid,$id,   my ($ad,$msg)=&check_submission($response,$partid,$id,
Removed from v.1.181  
changed lines
  Added in v.1.183

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