Diff for /loncom/homework/hint.pm between versions 1.33 and 1.44

version 1.33, 2002/11/25 21:36:42 version 1.44, 2003/06/20 04:18:49
Line 33  use Apache::lonnet; Line 33  use Apache::lonnet;
 use capa;  use capa;
   
 BEGIN {  BEGIN {
   &Apache::lonxml::register('Apache::hinttags',('hintgroup','hintpart','numericalhint','stringhint','formulahint','optionhint','radiobuttonhint'));      &Apache::lonxml::register('Apache::hinttags',('hintgroup','hintpart','numericalhint','stringhint','formulahint','optionhint','radiobuttonhint'));
 }  }
   
   
 @Apache::hint::which=();  @Apache::hint::which=();
 sub start_hintgroup {  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"};
     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='1';      &Apache::lonxml::get_all_text("/hintgroup",$parser);
     } else {   }
       if ($target eq 'web') {$result='<table bgcolor="#dddddd"><tr><td>';}   &Apache::lonxml::startredirection;
     }      } elsif ($target eq 'tex') {
     if ($skiptoend) {   $result .= '\keephidden{';
       &Apache::lonxml::get_all_text("/hintgroup",$$parser[$#$parser]);  
     }      }
   } elsif ($target eq 'tex') {      @Apache::hint::which=();
     $result .= '\keephidden{';       return $result;
   }  
   @Apache::hint::which=();  
   return $result;  
 }  }
   
 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"};
     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 ) {   my $hinttext=&Apache::lonxml::endredirection;
       $result='</td></tr></table>';   if ($Apache::lonhomework::type ne 'exam' &&
       $numtries >= $hinttries && $hinttext =~/\S/) {
       $result='<table bgcolor="#dddddd"><tr><td>'.
    $hinttext.'</td></tr></table>';
    }
       } elsif ($target eq 'edit') {
    $result.=&Apache::edit::end_table();
       } elsif ($target eq 'tex') {
    $result .= '}';
     }      }
   } elsif ($target eq 'edit') {      @Apache::hint::which=();
     $result.=&Apache::edit::end_table();      return $result;
   } elsif ($target eq 'tex') {  
     $result .= '}';   
   }  
   @Apache::hint::which=();  
   return $result;  
 }  }
   
 sub start_numericalhint {  sub start_numericalhint {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      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);      &Apache::response::start_hintresponse($parstack,$safeeval);
   my $result;      my $result;
   if ($target eq 'edit') {      if ($target eq 'edit') {
     $result.=&Apache::edit::tag_start($target,$token);   $result.=&Apache::edit::tag_start($target,$token);
     $result.=&Apache::edit::text_arg('Name:','name',$token);   $result.=&Apache::edit::text_arg('Name:','name',$token);
     $result.=&Apache::edit::text_arg('Answer:','answer',$token);   $result.=&Apache::edit::text_arg('Answer:','answer',$token);
     if ($token->[1] eq 'numericalhint') {   if ($token->[1] eq 'numericalhint') {
       $result.=&Apache::edit::text_arg('Unit:','unit',$token,5);      $result.=&Apache::edit::text_arg('Unit:','unit',$token,5).
       $result.=&Apache::edit::text_arg('Format:','format',$token,4);   &Apache::loncommon::help_open_topic('Physical_Units');
     } elsif ($token->[1] eq 'stringhint') {      $result.=&Apache::edit::text_arg('Format:','format',$token,4).
       $result.=&Apache::edit::select_arg('Type:','type',['cs','ci','mc'],$token);   &Apache::loncommon::help_open_topic('Numerical_Response_Format');
     } elsif ($token->[1] eq 'formulahint') {   } elsif ($token->[1] eq 'stringhint') {
       $result.=&Apache::edit::text_arg('Sample Points:','samples',$token,40);      $result.=&Apache::edit::select_arg('Type:','type',
     }      [['cs','Case Sensitive'],['ci','Case Insensitive'],
     $result.=&Apache::edit::end_row();       ['mc','Case Insensitive, Any Order']],$token);
     $result.=&Apache::edit::start_spanning_row();   } elsif ($token->[1] eq 'formulahint') {
   } elsif ($target eq 'modified') {      $result.=&Apache::edit::text_arg('Sample Points:','samples',$token,40);
     my $constructtag;   }
     if ($token->[1] eq 'numericalhint') {   $result.=&Apache::edit::end_row();
       $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,   $result.=&Apache::edit::start_spanning_row();
  'name','answer','unit','format');      } elsif ($target eq 'modified') {
     } elsif ($token->[1] eq 'stringhint') {   my $constructtag;
       $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,   if ($token->[1] eq 'numericalhint') {
  'name','answer','type');      $constructtag=&Apache::edit::get_new_args($token,$parstack,
     } elsif ($token->[1] eq 'formulahint') {       $safeeval,'name',
       $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,       'answer','unit','format');
  'name','answer','samples');   } elsif ($token->[1] eq 'stringhint') {
     }      $constructtag=&Apache::edit::get_new_args($token,$parstack,
     if ($constructtag) {       $safeeval,'name','answer',
       $result  = &Apache::edit::rebuild_tag($token);       'type');
       $result .= &Apache::edit::handle_insert();   } elsif ($token->[1] eq 'formulahint') {
       $constructtag=&Apache::edit::get_new_args($token,$parstack,
        $safeeval,'name','answer',
        'samples');
    }
    if ($constructtag) {
       $result  = &Apache::edit::rebuild_tag($token);
       $result .= &Apache::edit::handle_insert();
    }
       } elsif ($target eq 'web') {
    &Apache::response::reset_params();
     }      }
   } elsif ($target eq 'web') {      return $result;
       &Apache::response::reset_params();  
   }  
   return $result;  
 }  }
   
 sub end_numericalhint {  sub end_numericalhint {
   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') {
     if (!$Apache::lonxml::default_homework_loaded) {   if (!$Apache::lonxml::default_homework_loaded) {
  &Apache::lonxml::default_homework_load($safeeval);      &Apache::lonxml::default_homework_load($safeeval);
     }   }
     $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);
     &Apache::response::setup_params('numericalhint');   &Apache::response::setup_params('numericalhint');
     my $partid=$Apache::inputtags::part;   my $partid=$Apache::inputtags::part;
     my $id=$Apache::inputtags::response['-1'];   my $id=$Apache::inputtags::response['-1'];
     #id submissions occured under   #id submissions occured under
     my $submitid=$Apache::inputtags::response['-2'];   my $submitid=$Apache::inputtags::response['-2'];
     my $response = $Apache::lonhomework::history{   my $response = $Apache::lonhomework::history{
     "resource.$partid.$submitid.submission"};      "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   #build safe space expression
     my $expression="&caparesponse_check_list('".$response."','".   my $expression="&caparesponse_check_list('".$response."','".
       $$parstack[$#$parstack];      $$parstack[$#$parstack];
     #need to get all possible parms   #need to get all possible parms
     foreach my $key (keys(%Apache::inputtags::params)) {   foreach my $key (keys(%Apache::inputtags::params)) {
       $expression.= ';my $'. #'      $expression.= ';my $'. #'
  $key.'="'.$Apache::inputtags::params{$key}.'"';   $key.'="'.$Apache::inputtags::params{$key}.'"';
    }
    if ($$tagstack[-1] eq 'formulahint') {
       $expression.=';my $type="fml";';
    } elsif ($$tagstack[-1] eq 'numericalhint') {
       $expression.=';my $type="float";';
    }
    $expression.="');";
    $result = &Apache::run::run($expression,$safeeval);
    &Apache::lonxml::debug("$expression:result:$result:$Apache::lonxml::curdepth");
    my ($awards) = split /:/ , $result;
    my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
    if ($ad eq 'EXACT_ANS' || $ad eq 'APPROX_ANS') { push (@Apache::hint::which,$name); }
    $result='';
       } elsif ($target eq 'meta') {
    $result=&Apache::response::meta_package_write($token->[1]);
       } elsif ($target eq 'edit') {
    $result.='</td></tr>'.&Apache::edit::end_table;
     }      }
     $expression.="');";      &Apache::response::end_hintresponse();
     $result = &Apache::run::run($expression,$safeeval);      return $result;
     &Apache::lonxml::debug("$expression:result:$result:$Apache::lonxml::curdepth");  
     my ($awards) = split /:/ , $result;  
     my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);  
     if ($ad eq 'EXACT_ANS' || $ad eq 'APPROX_ANS') { push (@Apache::hint::which,$name); }  
     $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;  
 }  }
   
 sub start_stringhint {  sub start_stringhint {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      return &start_numericalhint(@_);
   my $result;  
   if ($target eq 'meta') {  
     $result=&Apache::response::meta_package_write('stringhint');  
   } else {  
     $result.=&start_numericalhint(@_);  
   }  
   return $result;  
 }  }
   
 sub end_stringhint {  sub end_stringhint {
   return end_numericalhint(@_);      return &end_numericalhint(@_);
 }  }
   
 sub start_formulahint {  sub start_formulahint {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      return &start_numericalhint(@_);
   my $result;  
   if ($target eq 'meta') {  
     $result=&Apache::response::meta_package_write('formulahint');  
   } else {  
     $result.=&start_numericalhint(@_);  
   }  
   return $result;  
 }  }
   
 sub end_formulahint {  sub end_formulahint {
   return end_numericalhint(@_);      return end_numericalhint(@_);
 }  }
   
 # a part shows if it is on, if no specific parts are on, then default shows  # a part shows if it is on, if no specific parts are on, then default shows
 sub start_hintpart {  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 = '';      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");
     if ( $on eq 'default' && $#Apache::hint::which == '-1') {   if ( $on eq 'default' && $#Apache::hint::which == '-1') {
       $show=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 } }
     }   }
     if (!$show) {   if (!$show) {
       &Apache::lonxml::get_all_text("/hintpart",$$parser[$#$parser]);      &Apache::lonxml::get_all_text("/hintpart",$parser);
     }   }
   } elsif ($target eq 'grade') {      } elsif ($target eq 'grade') {
     &Apache::lonxml::get_all_text("/hintpart",$$parser[$#$parser]);   &Apache::lonxml::get_all_text("/hintpart",$parser);
   } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
     $result.= &Apache::edit::tag_start($target,$token);   $result.= &Apache::edit::tag_start($target,$token);
     $result.= &Apache::edit::text_arg('On:','on',$token);   $result.= &Apache::edit::text_arg('On:','on',$token);
     $result.= &Apache::edit::end_row();   $result.= &Apache::edit::end_row();
     $result.= &Apache::edit::start_spanning_row();   $result.= &Apache::edit::start_spanning_row();
   } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
     my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,   my $constructtag=&Apache::edit::get_new_args($token,$parstack,
  'on');       $safeeval,'on');
     if ($constructtag) {   if ($constructtag) {
       $result = &Apache::edit::rebuild_tag($token);      $result = &Apache::edit::rebuild_tag($token);
       $result.=&Apache::edit::handle_insert();      $result.=&Apache::edit::handle_insert();
    }
     }      }
   }      return $result;
   return $result;  
 }  }
   
 sub end_hintpart {  sub end_hintpart {
Line 358  sub end_radiobuttonhint { Line 355  sub end_radiobuttonhint {
  my $response = $Apache::lonhomework::history{   my $response = $Apache::lonhomework::history{
     "resource.$part_id.submission"};      "resource.$part_id.submission"};
  ($response)=&Apache::lonnet::str2hash($response);   ($response)=&Apache::lonnet::str2hash($response);
  if ($answer[0] eq 'foil' && $response eq $answer[1]) {   &Apache::lonxml::debug("response is $response");
     push (@Apache::hint::which,$name);  
    if ($answer[0] eq 'foil') {
       shift(@answer);
       foreach my $answer (@answer) {
    if ($response eq $answer) {
       push (@Apache::hint::which,$name);
       last;
    }
       }
  } elsif ($answer[0] eq 'concept') {   } elsif ($answer[0] eq 'concept') {
     if (ref($Apache::hint::radiobutton{"$part_id.concept.".$answer[1]})) {      shift(@answer);
  my @names=@{ $Apache::hint::radiobutton{"$part_id.concept.".$answer[1]} };      foreach my $answer (@answer) {
  if (grep(/^\Q$response\E$/,@names)) {   if (ref($Apache::hint::radiobutton{"$part_id.concept.".$answer})) {
     push(@Apache::hint::which,$name);      my @names=@{ $Apache::hint::radiobutton{"$part_id.concept.".$answer} };
       if (grep(/^\Q$response\E$/,@names)) {
    push(@Apache::hint::which,$name);
    last;
       }
  }   }
     }      }
  }   }

Removed from v.1.33  
changed lines
  Added in v.1.44


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