Diff for /loncom/homework/caparesponse/caparesponse.pm between versions 1.20 and 1.32

version 1.20, 2000/12/12 14:54:10 version 1.32, 2001/06/29 18:53:50
Line 6  use strict; Line 6  use strict;
 use capa;  use capa;
   
 sub BEGIN {  sub BEGIN {
   &Apache::lonxml::register('Apache::caparesponse',('caparesponse'));    &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse'));
 }  }
   
 $Apache::caparesponse::result='';  
 sub start_caparesponse {  sub start_caparesponse {
   my ($target,$token,$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);
   return '';    return '';
 }  }
   
 sub end_caparesponse {  sub end_caparesponse {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result = '';    my $result = '';
   if ( $target eq 'grade' ) {    if ( $target eq 'grade' ) {
     if ( defined $ENV{'form.submit'}) {      if ( defined $ENV{'form.submitted'}) {
       $Apache::caparesponse::result='';  
       $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);        $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
       my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};        my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
       if ( $response =~ /[^\s]/) {        if ( $response =~ /[^\s]/) {
  #check_for_previous($response,$id,$response);   my $id = $Apache::inputtags::response['-1'];
  $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"}=$response;   my $previous= &Apache::response::check_for_previous($response,$id,$response);
  &Apache::lonxml::debug("submitted a $response<br>\n");   if ( $previous ) { 
  &Apache::lonxml::debug($$parstack[$#$parstack] . "\n<br>");    $result = 'PREVIOUSLY_USED';
  my $expression="&caparesponse_check('".$response."','".   } else {
   $$parstack[$#$parstack].    $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$response;
     ';my $tol="'.$Apache::inputtags::params{'tol'}.'"'.    &Apache::lonxml::debug("submitted a $response<br>\n");
       ';my $sig="'.$Apache::inputtags::params{'sig'}.'"'.    &Apache::lonxml::debug($$parstack[$#$parstack] . "\n<br>");
  "');";    my $expression="&caparesponse_check('".$response."','".
  $result = &Apache::run::run($expression,$safeeval);      $$parstack[$#$parstack].
  my ($ad) = split /:/ , $result;        ';my $tol="'.$Apache::inputtags::params{'tol'}.'"'.
  $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].awarddetail"}=$ad;   ';my $sig="'.$Apache::inputtags::params{'sig'}.'"'.
  &Apache::lonxml::debug("$expression");    "');";
  &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.$Apache::inputtags::part.$id.awarddetail"}=$ad;
     &Apache::lonxml::debug("$expression");
     &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
    }
       }        }
     }      }
   } else {    } elsif ($target eq 'web') {
     #$result .= "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");
   &Apache::response::end_response;    &Apache::response::end_response;
     return '';
   }
   
   sub start_numericalresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $id = &Apache::response::start_response($parstack,$safeeval);
     my $result;
     if ($target eq 'edit') {
       $result.=&Apache::edit::tag_start($target,$token,&Apache::lonxml::description($token));
       $result.=&Apache::edit::text_arg('Answer:','answer',$token).
         &Apache::edit::text_arg('Unit:','unit',$token).'</td></tr><tr><td colspan="3">';
     } elsif ($target eq 'modified') {
       my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
    'answer','unit');
       if ($constructtag) { $result = &Apache::edit::rebuild_tag($token);}
     }
     return $result;
   }
   
   sub end_numericalresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result = '';
     if ( $target eq 'grade' ) {
       if ( defined $ENV{'form.submitted'}) {
         $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
         my $response = $ENV{'form.HWVAL'.$Apache::inputtags::response['-1']};
         if ( $response =~ /[^\s]/) {
    my $id = $Apache::inputtags::response['-1'];
    my $previous= &Apache::response::check_for_previous($response,$id,$response);
    if ( $previous ) { 
     $result = 'PREVIOUSLY_USED';
    } else {
     $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$response;
     &Apache::lonxml::debug("submitted a $response<br>\n");
     &Apache::lonxml::debug($$parstack[$#$parstack] . "\n<br>");
     $response =~ s/\\/\\\\/g;
     $response =~ s/\'/\\\'/g;
     &Apache::lonxml::debug("current $response");
     my $expression="&caparesponse_check_list('".$response."','".
       $$parstack[$#$parstack].
         ';my $tol="'.$Apache::inputtags::params{'tol'}.'"'.
         ';my $sig="'.$Apache::inputtags::params{'sig'}.'"'.
    "');";
     $result = &Apache::run::run($expression,$safeeval);
     my ($awards) = split /:/ , $result;
     my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
     $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}=$ad;
     &Apache::lonxml::debug("$expression");
     &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
     $result='';
    }
         }
       }
     } elsif ($target eq 'web') {
       my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
       my $status = $Apache::inputtags::status['-1'];
       if ($award =~ /^correct/ || $status eq "SHOW_ANSWER" ) {
         my $answervar=&Apache::run::run("{$$parstack['-1'];".'return $answer}',$safeeval);
         my (@answers)=&Apache::run::run("$answervar",$safeeval);
         my $unit=&Apache::run::run("{$$parstack['-1'];".'return $unit}',$safeeval);
         
         $result="<br></br>The computer got ";
         my $answer;
         foreach $answer (@answers) { $result.="$answer,"; }
         chop $result;
         $result.=" $unit.<br></br>";
       }
     } elsif ($target eq 'edit') {
       $result.='</td></tr>'.&Apache::edit::end_table;
     }
     &Apache::response::end_response;
   return $result;    return $result;
 }  }
   

Removed from v.1.20  
changed lines
  Added in v.1.32


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