[BACK]Return to hint.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/hint.pm between versions 1.76 and 1.79

version 1.76, 2009/06/28 19:40:41 version 1.79, 2024/09/29 01:58:43
Line 81  sub start_hintgroup { Line 81  sub start_hintgroup {
        }         }
     }      }
     @Apache::hint::which=();      @Apache::hint::which=();
       if (($#Apache::functionplotresponse::failedrules>=0) && ($target eq 'web')) {
           @Apache::hint::which=@Apache::functionplotresponse::failedrules;
           undef @Apache::functionplotresponse::failedrules;
       }
     return $result;      return $result;
 }  }
   
Line 129  sub start_numericalhint { Line 133  sub start_numericalhint {
      $token,40).       $token,40).
         &Apache::loncommon::help_open_topic('Formula_Response_Sampling');          &Apache::loncommon::help_open_topic('Formula_Response_Sampling');
  }   }
           $result.=&Apache::edit::text_arg('Pre-Processor Subroutine:','preprocess',
                                                $token,10);
  $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') {
Line 136  sub start_numericalhint { Line 142  sub start_numericalhint {
  if ($token->[1] eq 'numericalhint') {   if ($token->[1] eq 'numericalhint') {
     $constructtag=&Apache::edit::get_new_args($token,$parstack,      $constructtag=&Apache::edit::get_new_args($token,$parstack,
      $safeeval,'name',       $safeeval,'name',
      'answer','unit','format');       'answer','unit','format','preprocess');
  } elsif ($token->[1] eq 'formulahint') {   } elsif ($token->[1] eq 'formulahint') {
     $constructtag=&Apache::edit::get_new_args($token,$parstack,      $constructtag=&Apache::edit::get_new_args($token,$parstack,
      $safeeval,'name','answer',       $safeeval,'name','answer',
      'samples');       'samples','preprocess');
  }   }
  if ($constructtag) {   if ($constructtag) {
     $result  = &Apache::edit::rebuild_tag($token);      $result  = &Apache::edit::rebuild_tag($token);
Line 179  sub end_numericalhint { Line 185  sub end_numericalhint {
  my $hideunit=&Apache::response::get_response_param($partid.'_'.$submitid,'turnoffunit');   my $hideunit=&Apache::response::get_response_param($partid.'_'.$submitid,'turnoffunit');
  if (lc($hideunit) eq "yes") { delete($$args_ref{'unit'}); }   if (lc($hideunit) eq "yes") { delete($$args_ref{'unit'}); }
   
           my $stringify;
  if ($$tagstack[-1] eq 'formulahint') {   if ($$tagstack[-1] eq 'formulahint') {
             if ($$args_ref{'samples'}) {              if ($$args_ref{'samples'}) {
                 $$args_ref{'type'}='fml';                  $$args_ref{'type'}='fml';
                   $stringify = 1;
             } else {              } else {
                 $$args_ref{'type'}='math';                  $$args_ref{'type'}='math';
             }              }
  } elsif ($$tagstack[-1] eq 'numericalhint') {   } elsif ($$tagstack[-1] eq 'numericalhint') {
     $$args_ref{'type'}='float';      $$args_ref{'type'}='float';
               $stringify = 1;
  }   }
  &Apache::caparesponse::add_in_tag_answer($parstack,$safeeval);   &Apache::caparesponse::add_in_tag_answer($parstack,$safeeval,$stringify);
  my %answer = &Apache::caparesponse::get_answer();   my %answer = &Apache::caparesponse::get_answer();
  my (@final_awards,@final_msgs,@ans_names);   my (@final_awards,@final_msgs,@ans_names);
  foreach my $ans_name (keys(%answer)) {   foreach my $ans_name (keys(%answer)) {
Line 377  sub start_stringhint { Line 386  sub start_stringhint {
  [['cs','Case Sensitive'],['ci','Case Insensitive'],   [['cs','Case Sensitive'],['ci','Case Insensitive'],
   ['mc','Case Insensitive, Any Order'],    ['mc','Case Insensitive, Any Order'],
   ['re','Regular Expression']],$token);    ['re','Regular Expression']],$token);
           $result.=&Apache::edit::text_arg('Pre-Processor Subroutine:','preprocess',
                                                $token,10);
  $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;   my $constructtag;
  $constructtag=&Apache::edit::get_new_args($token,$parstack,   $constructtag=&Apache::edit::get_new_args($token,$parstack,
   $safeeval,'name','answer',    $safeeval,'name','answer',
   'type');    'type','preprocess');
  $result  = &Apache::edit::rebuild_tag($token);   $result  = &Apache::edit::rebuild_tag($token);
     } elsif ($target eq 'web') {      } elsif ($target eq 'web') {
  &Apache::response::reset_params();   &Apache::response::reset_params();
Line 433  sub end_stringhint { Line 444  sub end_stringhint {
             if ($$args_ref{'type'} eq '') {              if ($$args_ref{'type'} eq '') {
                 $$args_ref{'type'} = 'ci';                  $$args_ref{'type'} = 'ci';
             }              }
     &Apache::caparesponse::add_in_tag_answer($parstack,$safeeval);              my $stringify;
               if ($$args_ref{'type'} ne 're') {
                   $stringify = 1;
               }
       &Apache::caparesponse::add_in_tag_answer($parstack,$safeeval,$stringify);
     my (@final_awards,@final_msgs,@ans_names);      my (@final_awards,@final_msgs,@ans_names);
     my %answer = &Apache::caparesponse::get_answer();      my %answer = &Apache::caparesponse::get_answer();
     foreach my $ans_name (keys(%answer)) {      foreach my $ans_name (keys(%answer)) {
Removed from v.1.76  
changed lines
  Added in v.1.79

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