Diff for /loncom/homework/hint.pm between versions 1.15 and 1.19

version 1.15, 2001/08/06 20:33:23 version 1.19, 2001/10/05 17:01:05
Line 38  sub start_hintgroup { Line 38  sub start_hintgroup {
 sub end_hintgroup {  sub end_hintgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result;    my $result;
     
   if ($target eq 'web') {    if ($target eq 'web') {
     my $id=$Apache::inputtags::part;      my $id=$Apache::inputtags::part;
     my $numtries=$Apache::lonhomework::history{"resource.$id.tries"};      my $numtries=$Apache::lonhomework::history{"resource.$id.tries"};
Line 46  sub end_hintgroup { Line 46  sub end_hintgroup {
     my $hinttries=&Apache::lonnet::EXT("resource.$id.hinttries");      my $hinttries=&Apache::lonnet::EXT("resource.$id.hinttries");
     if ( $hinttries eq '') { $hinttries = 1; }      if ( $hinttries eq '') { $hinttries = 1; }
     &Apache::lonxml::debug("found :$id:$numtries:$hinttries:");      &Apache::lonxml::debug("found :$id:$numtries:$hinttries:");
     if ( $numtries => $hinttries ) {      if ( $numtries >= $hinttries ) {
       if ($target eq 'web') {$result='</td></tr></table>';}        $result='</td></tr></table>';
     }      }
   }    }
   @Apache::hint::which='';    @Apache::hint::which=();
   return $result;    return $result;
 }  }
   
 sub start_numericalhint {  sub start_numericalhint {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   #do everything in end, so intervening <responseparams> work    #do everything in end, so intervening <responseparams> work
     &Apache::response::start_hintresponse($parstack,$safeeval);
   return '';    return '';
 }  }
   
Line 65  sub end_numericalhint { Line 67  sub end_numericalhint {
   if ($target eq 'web') {    if ($target eq 'web') {
     $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);      $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
     my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);      my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
     my $response = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"};      &Apache::response::setup_params('numericalhint');
       my $partid=$Apache::inputtags::part;
       my $id=$Apache::inputtags::response['-1'];
       #id submissions occured under
       my $submitid=$Apache::inputtags::response['-2'];
       my $response = $Apache::lonhomework::history{
       "resource.$partid.$submitid.submission"};
     &Apache::lonxml::debug("hintgroup is using $response<br />\n");      &Apache::lonxml::debug("hintgroup is using $response<br />\n");
       #build safe space expression
     my $expression="&caparesponse_check_list('".$response."','".      my $expression="&caparesponse_check_list('".$response."','".
       $$parstack[$#$parstack].        $$parstack[$#$parstack];
  ';my $tol="'.$Apache::inputtags::params{'tol'}.'"'.      #need to get all possible parms
  ';my $sig="'.$Apache::inputtags::params{'sig'}.'"'.      foreach my $key (keys(%Apache::inputtags::params)) {
   "');";        $expression.= ';my $'. #'
    $key.'="'.$Apache::inputtags::params{$key}.'"';
       }
       $expression.="');";
     $result = &Apache::run::run($expression,$safeeval);      $result = &Apache::run::run($expression,$safeeval);
     &Apache::lonxml::debug("$expression:result:$result:$Apache::lonxml::curdepth");      &Apache::lonxml::debug("$expression:result:$result:$Apache::lonxml::curdepth");
     my ($awards) = split /:/ , $result;      my ($awards) = split /:/ , $result;
     my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);      my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
     if ($ad eq 'EXACT_ANS' || $ad eq 'APPROX_ANS') { push (@Apache::hint::which,$name); }      if ($ad eq 'EXACT_ANS' || $ad eq 'APPROX_ANS') { push (@Apache::hint::which,$name); }
     $result='';      $result='';
     } elsif ($target eq 'meta') {
       $result=&Apache::response::meta_package_write('numericalhint');
   }    }
     &Apache::response::end_hintresponse();
   return $result;    return $result;
 }  }
   

Removed from v.1.15  
changed lines
  Added in v.1.19


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