[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.24 and 1.32

version 1.24, 2001/01/04 22:25:13 version 1.32, 2001/06/29 18:53:50
Line 10  sub BEGIN { Line 10  sub BEGIN {
 }  }
   
 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'}) {
       $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]/) {
Line 28  sub end_caparesponse { Line 28  sub end_caparesponse {
  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 38  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");
Line 53  sub end_caparesponse { Line 53  sub end_caparesponse {
 }  }
   
 sub start_numericalresponse {  sub start_numericalresponse {
   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 '';    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 {  sub end_numericalresponse {
   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'}) {
       $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]/) {
Line 71  sub end_numericalresponse { Line 81  sub end_numericalresponse {
  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>");
     $response =~ s/\\/\\\\/g;
     $response =~ s/\'/\\\'/g;
     &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'}.'"'.        ';my $tol="'.$Apache::inputtags::params{'tol'}.'"'.
Line 82  sub end_numericalresponse { Line 95  sub end_numericalresponse {
   $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);
   $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:$Apache::caparesponse::result:$result:$Apache::lonxml::curdepth<br>\n");    &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
   $result='';    $result='';
  }   }
       }        }
     }      }
   } elsif ($target eq 'web') {    } elsif ($target eq 'web') {
     my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};      my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
     if ($award =~ /^correct/) {      my $status = $Apache::inputtags::status['-1'];
       if ($award =~ /^correct/ || $status eq "SHOW_ANSWER" ) {
       my $answervar=&Apache::run::run("{$$parstack['-1'];".'return $answer}',$safeeval);        my $answervar=&Apache::run::run("{$$parstack['-1'];".'return $answer}',$safeeval);
       my (@answers)=&Apache::run::run("$answervar",$safeeval);        my (@answers)=&Apache::run::run("$answervar",$safeeval);
       my $unit=&Apache::run::run("{$$parstack['-1'];".'return $unit}',$safeeval);        my $unit=&Apache::run::run("{$$parstack['-1'];".'return $unit}',$safeeval);
Line 102  sub end_numericalresponse { Line 116  sub end_numericalresponse {
       chop $result;        chop $result;
       $result.=" $unit.<br></br>";        $result.=" $unit.<br></br>";
     }      }
     } elsif ($target eq 'edit') {
       $result.='</td></tr>'.&Apache::edit::end_table;
   }    }
   &Apache::response::end_response;    &Apache::response::end_response;
   return $result;    return $result;
Removed from v.1.24  
changed lines
  Added in v.1.32

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