Diff for /loncom/homework/caparesponse/caparesponse.pm between versions 1.12 and 1.18

version 1.12, 2000/11/21 18:42:12 version 1.18, 2000/12/08 20:53:45
Line 15  sub start_caparesponse { Line 15  sub start_caparesponse {
   my $args ='';    my $args ='';
   if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }    if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
   my $id = &Apache::run::run("{$args;".'return $id}',$safeeval);    my $id = &Apache::run::run("{$args;".'return $id}',$safeeval);
     if ($id eq '') { $id = $Apache::lonxml::curdepth; }
   push (@Apache::inputtags::response,$id);    push (@Apache::inputtags::response,$id);
     push (@Apache::inputtags::responselist,$id);
     return '';
   #my $envkey;    #my $envkey;
   #foreach $envkey (sort keys %ENV) {    #foreach $envkey (sort keys %ENV) {
   #  Apache::lonxml::debug("$envkey ---- $ENV{$envkey}<br>");    #  Apache::lonxml::debug("$envkey ---- $ENV{$envkey}<br>");
Line 27  sub start_caparesponse { Line 29  sub start_caparesponse {
 sub end_caparesponse {  sub end_caparesponse {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
   my $result = '';    my $result = '';
   if ( defined $ENV{'form.'.$ENV{'form.request.prefix'}.'submit'}) {    if ( $target eq 'grade' ) {
     $Apache::caparesponse::result='';      if ( defined $ENV{'form.submit'}) {
     $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);        $Apache::caparesponse::result='';
     my $response = $ENV{'form.HWVAL'.$Apache::inputtags::curvalue};        $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
     $Apache::lonhomework::results{"resource.submission.part$Apache::inputtags::part['-1'].response$Apache::inputtags::response['-1']"}=$response;        my $response = $ENV{'form.HWVAL'.$Apache::inputtags::curvalue};
     &Apache::lonxml::debug("submitted a $response<br>\n");        if ( $response =~ /[^\s]/) {
     &Apache::lonxml::debug($$parstack[$#$parstack] . "\n<br>");   $Apache::lonhomework::results{"resource.submission.$Apache::inputtags::part.$Apache::inputtags::response['-1']"}=$response;
     my $tol=$Apache::inputtags::{'tol'};   &Apache::lonxml::debug("submitted a $response<br>\n");
     my $expression="&caparesponse_check('".$response."','".   &Apache::lonxml::debug($$parstack[$#$parstack] . "\n<br>");
       $$parstack[$#$parstack].   my $expression="&caparesponse_check('".$response."','".
  ';my $tol='.$Apache::inputtags::{'tol'}.    $$parstack[$#$parstack].
   "');";      ';my $tol="'.$Apache::inputtags::params{'tol'}.'"'.
     $result = &Apache::run::run($expression,$safeeval);        ';my $sig="'.$Apache::inputtags::params{'sig'}.'"'.
        "');";
     &Apache::lonxml::debug("\n<br>result:$Apache::caparesponse::result:$result:$Apache::lonxml::curdepth<br>\n");   $result = &Apache::run::run($expression,$safeeval);
        my ($ad) = split /:/ , $result;
    $Apache::lonhomework::results{"resource.awarddetail.$Apache::inputtags::part.$Apache::inputtags::response['-1']"}=$ad;
    &Apache::lonxml::debug("$expression");
    &Apache::lonxml::debug("\n<br>result:$Apache::caparesponse::result:$result:$Apache::lonxml::curdepth<br>\n");
         }
       }
   } else {    } else {
     #return "The correct answer is ".&Apache::run::run("{$$parstack['-1'];".'return $answer}',$safeeval)."\n";      #$result .= "The correct answer is ".&Apache::run::run("{$$parstack['-1'];".'return $answer}',$safeeval)."\n";
   }    }
   #Apache::lonxml::debug("\n<br>\nreal end caparesponse<br>\n");    #Apache::lonxml::debug("\n<br>\nreal end caparesponse<br>\n");
   pop @Apache::inputtags::part;    pop @Apache::inputtags::response;
   return '';    return $result;
 }  }
   
 1;  1;

Removed from v.1.12  
changed lines
  Added in v.1.18


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