[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.39 and 1.43

version 1.39, 2001/08/05 16:26:28 version 1.43, 2001/09/18 02:21:13
Line 81  sub start_numericalresponse { Line 81  sub start_numericalresponse {
       $result.=&Apache::edit::handle_insert();        $result.=&Apache::edit::handle_insert();
     }      }
   } elsif ($target eq 'meta') {    } elsif ($target eq 'meta') {
     $result=&meta_package_write('numericalresponse');      $result=&Apache::response::meta_package_write('numericalresponse');
   }    }
   return $result;    return $result;
 }  }
Line 91  sub end_numericalresponse { Line 91  sub end_numericalresponse {
   my $result = '';    my $result = '';
   if ( $target eq 'grade' ) {    if ( $target eq 'grade' ) {
     if ( defined $ENV{'form.submitted'}) {      if ( defined $ENV{'form.submitted'}) {
         &Apache::response::setup_params('numericalresponse');
       $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 104  sub end_numericalresponse { Line 105  sub end_numericalresponse {
  $response =~ s/\'/\\\'/g;   $response =~ s/\'/\\\'/g;
  &Apache::lonxml::debug("current $response");   &Apache::lonxml::debug("current $response");
  my $expression="&caparesponse_check_list('".$response."','".   my $expression="&caparesponse_check_list('".$response."','".
   $$parstack[$#$parstack].    $$parstack[$#$parstack];
     ';my $tol="'.$Apache::inputtags::params{'tol'}.'"'.   foreach my $key (keys(%Apache::inputtags::params)) {
       ';my $sig="'.$Apache::inputtags::params{'sig'}.'"'.    $expression.= ';my $'. #'
  "');";      $key.'="'.$Apache::inputtags::params{$key}.'"';
    }
    $expression.="');";
  $result = &Apache::run::run($expression,$safeeval);   $result = &Apache::run::run($expression,$safeeval);
  my ($awards) = split /:/ , $result;   my ($awards) = split /:/ , $result;
  my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);   my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
Line 162  sub end_numericalresponse { Line 165  sub end_numericalresponse {
     }      }
   } 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') {
       my $answer= &Apache::run::run('eval \''.$$parstack[-1].';return $answer\'',
     $safeeval);
       my (@answers) = &Apache::run::run("eval ".$answer,$safeeval);
       # if the eval fails just use what is in the answer exactly
       if (!defined(@answers) || !defined($answers[0])) {
         $result.="list zero is undefined<br />";
         $answers[0]=$answer;
       }
       $result.="<br /> An answers: $answer";
       foreach my $ans (@answers) {
         $result.="<br /> An answer: $ans";
       }
       $result .= "<br />".&Apache::run::run('return $result',$safeeval);
   }    }
   &Apache::response::end_response;    &Apache::response::end_response;
   return $result;    return $result;
 }  }
   
 sub start_stringresponse {  sub start_stringresponse {
   return start_numericalresponse(@_);    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
     if ($target eq 'meta') {
       $result=&Apache::response::meta_package_write('stringresponse');
     } else {
       $result.=&start_numericalresponse(@_);
     }
     return $result;
 }  }
   
 sub end_stringresponse {  sub end_stringresponse {
Removed from v.1.39  
changed lines
  Added in v.1.43

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