Diff for /loncom/homework/hint.pm between versions 1.5 and 1.10

version 1.5, 2001/01/22 16:42:01 version 1.10, 2001/04/05 00:08:40
Line 2  package Apache::hinttags; Line 2  package Apache::hinttags;
   
 use strict;  use strict;
 use Apache::lonnet;  use Apache::lonnet;
   use capa;
   
 sub BEGIN {  sub BEGIN {
   &Apache::lonxml::register('Apache::hinttags',('hintgroup','hintpart','numericalhint'));    &Apache::lonxml::register('Apache::hinttags',('hintgroup','hintpart','numericalhint'));
Line 11  sub BEGIN { Line 12  sub BEGIN {
 @Apache::hint::which=();  @Apache::hint::which=();
 sub start_hintgroup {  sub start_hintgroup {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
   my $skiptoend='1';    my $skiptoend='0';
   my $result;    my $result;
       
   if ($target ne 'meta' || $target ne 'grade') {    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"};
     if ( $numtries eq '') { $numtries = 0; }      if ( $numtries eq '') { $numtries = 0; }
     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 ) {
       $skiptoend='0';         $skiptoend='1'; 
       } 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]);
Line 37  sub end_hintgroup { Line 39  sub end_hintgroup {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
   my $result;    my $result;
   
   if ($target ne 'meta' || $target ne 'grade') {    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"};
     if ( $numtries eq '') { $numtries = 0; }      if ( $numtries eq '') { $numtries = 0; }
     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>';}        if ($target eq 'web') {$result='</td></tr></table>';}
     }      }
   }    }
Line 59  sub start_numericalhint { Line 61  sub start_numericalhint {
 sub end_numericalhint {  sub end_numericalhint {
   my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
   my $result;    my $result;
   if ($target ne 'meta' && $target ne 'grade') {    if ($target eq 'web') {
     my $args ='';      my $args ='';
       $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
     if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }      if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
     my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);      my $name = &Apache::run::run("{$args;".'return $name}',$safeeval);
     my $response = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"};      my $response = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.$Apache::inputtags::response['-1'].submission"};
     &Apache::lonxml::debug("hintgroup is using $response<br>\n");      &Apache::lonxml::debug("hintgroup is using $response<br />\n");
     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'}.'"'.
  ';my $sig="'.$Apache::inputtags::params{'sig'}.'"'.   ';my $sig="'.$Apache::inputtags::params{'sig'}.'"'.
   "');";    "');";
     $result = &Apache::run::run($expression,$safeeval);      $result = &Apache::run::run($expression,$safeeval);
       &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); }
     &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");  
     $result='';      $result='';
   }    }
   return $result;    return $result;
Line 86  sub start_hintpart { Line 89  sub start_hintpart {
   
   my $show ='0';    my $show ='0';
   
   if ($target ne 'meta' && $target ne 'grade') {    if ($target eq 'web') {
     my $args ='';      my $args ='';
     if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }      if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
     my $on = &Apache::run::run("{$args;".'return $on}',$safeeval);      my $on = &Apache::run::run("{$args;".'return $on}',$safeeval);
       &Apache::lonxml::debug("hintpart sees $on and ,$#Apache::hint::which");
     if ( $on eq 'default' && $#Apache::hint::which == '-1') {      if ( $on eq 'default' && $#Apache::hint::which == '-1') {
         $show=1;
     } else {      } else {
       my $which;        my $which;
       foreach $which (@Apache::hint::which) { if ($which eq $on) { $show = 1; last } }        foreach $which (@Apache::hint::which) { if ($which eq $on) { $show = 1; last } }
Line 98  sub start_hintpart { Line 103  sub start_hintpart {
     if (!$show) {      if (!$show) {
       &Apache::lonxml::get_all_text("/hintpart",$$parser[$#$parser]);        &Apache::lonxml::get_all_text("/hintpart",$$parser[$#$parser]);
     }      }
   } else {    } elsif ($target eq 'grade') {
     &Apache::lonxml::get_all_text("/hintpart",$$parser[$#$parser]);      &Apache::lonxml::get_all_text("/hintpart",$$parser[$#$parser]);
   }    }
   return '';    return '';

Removed from v.1.5  
changed lines
  Added in v.1.10


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