[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.10 and 1.11

version 1.10, 2000/10/13 14:59:31 version 1.11, 2000/10/25 22:02:53
Line 24  sub end_caparesponse { Line 24  sub end_caparesponse {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
   if ( defined $ENV{'form.'.$ENV{'form.request.prefix'}.'submit'}) {    if ( defined $ENV{'form.'.$ENV{'form.request.prefix'}.'submit'}) {
     $Apache::caparesponse::result='';      $Apache::caparesponse::result='';
     $safeeval->share('&caparesponse_capa_check_answer');      $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
     $safeeval->share('$Apache::caparesponse::result');  
     my $response = $ENV{'form.'.$ENV{'form.request.prefix'}.'HWVAL'.$Apache::inputtags::curvalue};      my $response = $ENV{'form.'.$ENV{'form.request.prefix'}.'HWVAL'.$Apache::inputtags::curvalue};
     #Apache::lonxml::debug("submitted a $response<br>\n");      &Apache::lonxml::debug("submitted a $response<br>\n");
     #Apache::lonxml::debug($$parstack[$#$parstack] . "\n<br>");      &Apache::lonxml::debug($$parstack[$#$parstack] . "\n<br>");
     my $expression="caparesponse_check $response $$parstack[$#$parstack];";      my $expression="&caparesponse_check('".$response."','".$$parstack[$#$parstack]."');";
     #&Apache::run::run($expression,$safeeval);      my $result = &Apache::run::run($expression,$safeeval);
           
     #&Apache::lonxml::debug("\n<br>result:$Apache::caparesponse::result:<br>\n");      &Apache::lonxml::debug("\n<br>result:$Apache::caparesponse::result:$result<br>\n");
     my $args ='';  
     if ( $#$parstack > -1 ) {  
       $args=$$parstack[$#$parstack];  
     }  
     my $answer = &Apache::run::run("{$args;".'return $answer}',$safeeval);  
     if ( $answer == 1.0 * $answer ) {  
       my $tol = &Apache::run::run("{$args;".'return $tol}',$safeeval);  
       my $format = &Apache::run::run("{$args;".'return $format}',$safeeval);  
       my $formatedanswer = sprintf('%.'.$format,$answer);  
       my $difference = abs($answer - $formatedanswer);  
       my $studiff = abs($answer - $response);  
       if ( $difference > $studiff ) {  
  return "Correct, Computer had $answer<br></br>";  
       } else {  
  return "Incorrect, Computer had $answer<br></br>";  
       }  
     } else {    
       if ( $answer eq $response ) {  
  return "Correct, Computer had $answer<br></br>";  
       } else {  
  return "Incorrect, Computer had $answer<br></br>";  
       }  
     }  
   } else {    } else {
     #return "The correct answer is ".&Apache::run::run("{$$parstack['-1'];".'return $answer}',$safeeval)."\n";      #return "The correct answer is ".&Apache::run::run("{$$parstack['-1'];".'return $answer}',$safeeval)."\n";
   }    }
Removed from v.1.10  
changed lines
  Added in v.1.11

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