[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.22 and 1.30

version 1.22, 2000/12/28 00:17:32 version 1.30, 2001/04/05 00:10:55
Line 19  sub end_caparesponse { Line 19  sub end_caparesponse {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$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'}) {
       $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]/) {
  my $previous= &check_for_previous($response,$id,$response);   my $id = $Apache::inputtags::response['-1'];
    my $previous= &Apache::response::check_for_previous($response,$id,$response);
  if ( $previous ) {    if ( $previous ) { 
   $result = 'PREVIOUSLY_USED';    $result = 'PREVIOUSLY_USED';
  } else {   } else {
   $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"}=$response;    $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$response;
   &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."','".    my $expression="&caparesponse_check('".$response."','".
Line 37  sub end_caparesponse { Line 38  sub end_caparesponse {
   "');";    "');";
   $result = &Apache::run::run($expression,$safeeval);    $result = &Apache::run::run($expression,$safeeval);
   my ($ad) = split /:/ , $result;    my ($ad) = split /:/ , $result;
   $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].awarddetail"}=$ad;    $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}=$ad;
   &Apache::lonxml::debug("$expression");    &Apache::lonxml::debug("$expression");
   &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");    &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 $result;    return '';
 }  }
   
 sub start_numericalresponse {  sub start_numericalresponse {
Line 61  sub end_numericalresponse { Line 62  sub end_numericalresponse {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$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'}) {
       $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]/) {
  my $previous= &check_for_previous($response,$id,$response);   my $id = $Apache::inputtags::response['-1'];
    my $previous= &Apache::response::check_for_previous($response,$id,$response);
  if ( $previous ) {    if ( $previous ) { 
   $result = 'PREVIOUSLY_USED';    $result = 'PREVIOUSLY_USED';
  } else {   } else {
   $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"}=$response;    $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}=$response;
   &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."','".    $response =~ s/\\/\\\\/g;
     $response =~ s/\'/\\\'/g;
     &Apache::lonxml::debug("current $response");
     my $expression="&caparesponse_check_list('".$response."','".
     $$parstack[$#$parstack].      $$parstack[$#$parstack].
       ';my $tol="'.$Apache::inputtags::params{'tol'}.'"'.        ';my $tol="'.$Apache::inputtags::params{'tol'}.'"'.
       ';my $sig="'.$Apache::inputtags::params{'sig'}.'"'.        ';my $sig="'.$Apache::inputtags::params{'sig'}.'"'.
  "');";   "');";
   $result = &Apache::run::run($expression,$safeeval);    $result = &Apache::run::run($expression,$safeeval);
   my ($ad) = split /:/ , $result;    my ($awards) = split /:/ , $result;
   $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].awarddetail"}=$ad;    my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
     $Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}=$ad;
   &Apache::lonxml::debug("$expression");    &Apache::lonxml::debug("$expression");
   &Apache::lonxml::debug("\n<br>result:$Apache::caparesponse::result:$result:$Apache::lonxml::curdepth<br>\n");    &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>";
       }
   }    }
   &Apache::response::end_response;    &Apache::response::end_response;
   return $result;    return $result;
Removed from v.1.22  
changed lines
  Added in v.1.30

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