Diff for /loncom/homework/hint.pm between versions 1.13 and 1.20

version 1.13, 2001/06/02 03:59:59 version 1.20, 2001/10/09 20:45:13
Line 14  sub start_hintgroup { Line 14  sub start_hintgroup {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $skiptoend='0';    my $skiptoend='0';
   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 27  sub start_hintgroup { Line 27  sub start_hintgroup {
     } else {      } else {
       if ($target eq 'web') {$result='<table bgcolor="#dddddd"><tr><td>';}        if ($target eq 'web') {$result='<table bgcolor="#dddddd"><tr><td>';}
     }      }
   }      if ($skiptoend) {
   if ($skiptoend) {        &Apache::lonxml::get_all_text("/hintgroup",$$parser[$#$parser]);
     &Apache::lonxml::get_all_text("/hintgroup",$$parser[$#$parser]);      }
   }    }
   @Apache::hint::which=();    @Apache::hint::which=();
   return $result;    return $result;
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>';
     }      }
     } elsif ($target eq 'edit') {
       $result.=&Apache::edit::end_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
   return '';    &Apache::response::start_hintresponse($parstack,$safeeval);
     my $result;
     if ($target eq 'edit') {
       $result.=&Apache::edit::tag_start($target,$token);
       $result.=&Apache::edit::text_arg('Name:','name',$token);
       $result.=&Apache::edit::text_arg('Answer:','answer',$token);
       $result.=&Apache::edit::text_arg('Unit:','unit',$token,5);
       $result.=&Apache::edit::text_arg('Format:','format',$token,4);
       $result.='</td></tr><tr><td colspan="3">';
     } elsif ($target eq 'modified') {
       my $constructtag=
         &Apache::edit::get_new_args($token,$parstack,$safeeval,
     'name','answer','unit', 'format');
       if ($constructtag) {
         $result  = &Apache::edit::rebuild_tag($token);
         $result .= &Apache::edit::handle_insert();
       }
     }
     return $result;
 }  }
   
 sub end_numericalhint {  sub end_numericalhint {
Line 65  sub end_numericalhint { Line 86  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');
     } elsif ($target eq 'edit') {
       $result.='</td></tr>'.&Apache::edit::end_table;
   }    }
     &Apache::response::end_hintresponse();
   return $result;    return $result;
 }  }
   
Line 87  sub start_hintpart { Line 123  sub start_hintpart {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   
   my $show ='0';    my $show ='0';
     my $result = '';
   if ($target eq 'web') {    if ($target eq 'web') {
     my $on= &Apache::lonxml::get_param('on',$parstack,$safeeval);      my $on= &Apache::lonxml::get_param('on',$parstack,$safeeval);
     &Apache::lonxml::debug("hintpart sees $on and ,$#Apache::hint::which");      &Apache::lonxml::debug("hintpart sees $on and ,$#Apache::hint::which");
Line 102  sub start_hintpart { Line 138  sub start_hintpart {
     }      }
   } elsif ($target eq 'grade') {    } elsif ($target eq 'grade') {
     &Apache::lonxml::get_all_text("/hintpart",$$parser[$#$parser]);      &Apache::lonxml::get_all_text("/hintpart",$$parser[$#$parser]);
     } elsif ($target eq 'edit') {
       $result.= &Apache::edit::tag_start($target,$token,
          &Apache::lonxml::description($token));
       $result.= &Apache::edit::text_arg('On:','on',$token).'</td></tr><tr><td colspan="3">';
     } elsif ($target eq 'modified') {
       my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
    'on');
       if ($constructtag) {
         $result = &Apache::edit::rebuild_tag($token);
         $result.=&Apache::edit::handle_insert();
       }
   }    }
   return '';    return $result;
 }  }
   
 sub end_hintpart {  sub end_hintpart {
   return '';    my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;
     if ($target eq 'edit') { $result.=&Apache::edit::end_table; }
     return $result;
 }  }
   
 1;  1;

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


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