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

Diff for /loncom/homework/hint.pm between versions 1.51 and 1.63

version 1.51, 2004/03/16 19:47:47 version 1.63, 2006/12/18 21:12:51
Line 31  package Apache::hinttags; Line 31  package Apache::hinttags;
 use strict;  use strict;
 use Apache::lonnet;  use Apache::lonnet;
 use capa;  use capa;
   use Apache::lonmaxima();
   use Apache::response();
   use Apache::lonlocal;
   
 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','mathhint'));
 }  }
   
   
Line 47  sub start_hintgroup { Line 50  sub start_hintgroup {
  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::response::get_response_param($id,"hinttries",1);
  if ($ENV{'request.state'} eq 'construct' &&  
     defined($Apache::inputtags::params{'hinttries'})) {  
     $hinttries=$Apache::inputtags::params{'hinttries'};  
  }  
   
  if ( $hinttries eq '') { $hinttries = 1; }  
  &Apache::lonxml::debug("found :$id:$numtries:$hinttries:");   &Apache::lonxml::debug("found :$id:$numtries:$hinttries:");
  my $gradestatus=$Apache::lonhomework::history{"resource.$id.solved"};   my $gradestatus=
  if ( $numtries < $hinttries || $gradestatus =~ /^correct/) {      $Apache::lonhomework::history{"resource.$id.solved"};
     &Apache::lonxml::get_all_text("/hintgroup",$parser);   my $showoncorrect=lc(&Apache::lonxml::get_param('showoncorrect',$parstack,$safeeval));
    &Apache::lonxml::debug("onc orrect $showoncorrect, $gradestatus");
    if ( ($showoncorrect ne 'yes' && &Apache::response::show_answer()) ||
        ( $numtries < $hinttries) ) {
       &Apache::lonxml::debug("Grabbin all");
       &Apache::lonxml::get_all_text("/hintgroup",$parser,$style);
  }   }
  &Apache::lonxml::startredirection;   &Apache::lonxml::startredirection;
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $result .= '\keephidden{';   $result .= '\keephidden{';
       } elsif ($target eq 'edit') {
    $result.=&Apache::edit::tag_start($target,$token);
    $result.=&Apache::edit::select_arg('Show hint even if problem Correct:','showoncorrect',[['no',&mt('No')],['yes',&mt('Yes')]],$token);
    $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
       } elsif ($target eq 'modified') {
    my $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,'showoncorrect');
          if ($constructtag) {
              $result =&Apache::edit::rebuild_tag($token);
              $result.=&Apache::edit::handle_insert();
          }
     }      }
     @Apache::hint::which=();      @Apache::hint::which=();
     return $result;      return $result;
Line 75  sub end_hintgroup { Line 87  sub end_hintgroup {
  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::response::get_response_param($id,"hinttries",1);
  if ( $hinttries eq '') { $hinttries = 1; }  
  &Apache::lonxml::debug("found :$id:$numtries:$hinttries:");   &Apache::lonxml::debug("found :$id:$numtries:$hinttries:");
  my $hinttext=&Apache::lonxml::endredirection;   my $hinttext=&Apache::lonxml::endredirection;
  if ($Apache::lonhomework::type ne 'exam' &&   if ($Apache::lonhomework::type ne 'exam' &&
Line 85  sub end_hintgroup { Line 96  sub end_hintgroup {
  $hinttext.'</td></tr></table>';   $hinttext.'</td></tr></table>';
  }   }
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result.=&Apache::edit::end_table();   $result.=&Apache::edit::end_row().&Apache::edit::end_table();
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $result .= '}';   $result .= '}';
     }      }
Line 152  sub end_numericalhint { Line 163  sub end_numericalhint {
  my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);   my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
  &Apache::response::setup_params('numericalhint',$safeeval);   &Apache::response::setup_params('numericalhint',$safeeval);
  my $partid=$Apache::inputtags::part;   my $partid=$Apache::inputtags::part;
  my $id=$Apache::inputtags::response['-1'];   my $id=$Apache::inputtags::hint[-1];
  #id submissions occured under   #id submissions occured under
  my $submitid=$Apache::inputtags::response['-2'];   my $submitid=$Apache::inputtags::response[-1];
  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");
  my $hideunit=&Apache::lonnet::EXT('resource.'.$submitid.'_'.$id.'.turnoffunit');   my $hideunit=&Apache::response::get_response_param($partid.'_'.$submitid,'turnoffunit');
  my $args_ref= \%{$safeeval->varglob('LONCAPA::CAPAresponse_args')};   my $args_ref= \%{$safeeval->varglob('LONCAPA::CAPAresponse_args')};
  $$args_ref{'response'}=$response;   $$args_ref{'response'}=$response;
  #need to get all possible parms   #need to get all possible parms
Line 192  sub end_numericalhint { Line 203  sub end_numericalhint {
     } elsif ($target eq 'meta') {      } elsif ($target eq 'meta') {
  $result=&Apache::response::meta_package_write($token->[1]);   $result=&Apache::response::meta_package_write($token->[1]);
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result.='</td></tr>'.&Apache::edit::end_table;   $result.=&Apache::edit::end_row().&Apache::edit::end_table();
     }      }
     &Apache::response::end_hintresponse();      &Apache::response::end_hintresponse();
     return $result;      return $result;
Line 206  sub end_formulahint { Line 217  sub end_formulahint {
     return &end_numericalhint(@_);      return &end_numericalhint(@_);
 }  }
   
   sub start_mathhint {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       #do everything in end, so intervening <responseparams> and <answer> work
       &Apache::response::start_hintresponse($parstack,$safeeval);
       &Apache::lonxml::register('Apache::response',('answer'));
       my $result;
       if ($target eq 'edit') {
           $result.=&Apache::edit::tag_start($target,$token);
           $result.=&Apache::edit::text_arg('Name:','name',$token);
           $result.=&Apache::edit::select_arg('Algebra System:',
                                              'cas',
                                              ['maxima'],
                                              $token);
           $result.=&Apache::edit::text_arg('Argument Array:',
                                            'args',$token);
           $result.=&Apache::edit::end_row();
           $result.=&Apache::edit::start_spanning_row();
       } elsif ($target eq 'modified') {
           my $constructtag;
           $constructtag=&Apache::edit::get_new_args($token,$parstack,
                                                     $safeeval,'name','cas',
                                                     'args');
           $result  = &Apache::edit::rebuild_tag($token);
           $result .= &Apache::edit::handle_insert();
       } elsif ($target eq 'web') {
           &Apache::response::reset_params();
       }
       return $result;
   }
   
   sub end_mathhint {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       my $result;
       if ($target eq 'web') {
           if (!$Apache::lonxml::default_homework_loaded) {
               &Apache::lonxml::default_homework_load($safeeval);
           }
    my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
           &Apache::response::setup_params('mathhint',$safeeval);
           my $partid=$Apache::inputtags::part;
           my $submitid=$Apache::inputtags::response[-1];
           my $response = $Apache::lonhomework::history{
                               "resource.$partid.$submitid.submission"};
   
    my $cas = &Apache::lonxml::get_param('cas',$parstack,$safeeval);
    my $award;
    if ($cas eq 'maxima') {
       my $args = [&Apache::lonxml::get_param_var('args',$parstack,$safeeval)];
       $award=&Apache::lonmaxima::maxima_run($Apache::response::custom_answer[-1],$response,$args);
    }
           if ($award eq 'EXACT_ANS' || $award 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.=&Apache::edit::end_row().&Apache::edit::end_table();
       }
       pop(@Apache::response::custom_answer);
       pop(@Apache::response::custom_answer_type);
       &Apache::response::end_hintresponse();
       return $result;
   }
   
 sub start_stringhint {  sub start_stringhint {
     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
Line 246  sub end_stringhint { Line 322  sub end_stringhint {
  my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);   my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
  &Apache::response::setup_params('stringhint',$safeeval);   &Apache::response::setup_params('stringhint',$safeeval);
  my $partid=$Apache::inputtags::part;   my $partid=$Apache::inputtags::part;
  my $id=$Apache::inputtags::response['-1'];   my $id=$Apache::inputtags::hint[-1];
  #id submissions occured under   #id submissions occured under
  my $submitid=$Apache::inputtags::response['-2'];   my $submitid=$Apache::inputtags::response[-1];
  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");
Line 258  sub end_stringhint { Line 334  sub end_stringhint {
  my ($ad,$msg);   my ($ad,$msg);
  if ($type eq 're' ) {   if ($type eq 're' ) {
     ${$safeeval->varglob('LONCAPA::response')}=$response;      ${$safeeval->varglob('LONCAPA::response')}=$response;
     $result = &Apache::run::run('return $LONCAPA::response=~m'.$answer,$safeeval);      my $compare='=';
       if ($answer=~/^\s*NOT\s*/) {
    $answer=~s/^\s*NOT\s*//;
    $compare='!';
       }
       my $test='$LONCAPA::response'.$compare.'~m'.$answer;
       &Apache::lonxml::debug("test $test");
       $result = &Apache::run::run("return $test",$safeeval);
     &Apache::lonxml::debug("current $response");      &Apache::lonxml::debug("current $response");
     &Apache::lonxml::debug("current $answer");      &Apache::lonxml::debug("current $answer");
     $ad = ($result) ? 'APPROX_ANS' : 'INCORRECT';      $ad = ($result) ? 'APPROX_ANS' : 'INCORRECT';
Line 284  sub end_stringhint { Line 367  sub end_stringhint {
     } elsif ($target eq 'meta') {      } elsif ($target eq 'meta') {
  $result=&Apache::response::meta_package_write($token->[1]);   $result=&Apache::response::meta_package_write($token->[1]);
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result.='</td></tr>'.&Apache::edit::end_table;   $result.=&Apache::edit::end_row().&Apache::edit::end_table();
     }      }
     &Apache::response::end_hintresponse();      &Apache::response::end_hintresponse();
     return $result;      return $result;
Line 306  sub start_hintpart { Line 389  sub start_hintpart {
     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);      &Apache::lonxml::get_all_text("/hintpart",$parser,$style);
  }   }
     } elsif ($target eq 'grade') {      } elsif ($target eq 'grade') {
  &Apache::lonxml::get_all_text("/hintpart",$parser);   &Apache::lonxml::get_all_text("/hintpart",$parser,$style);
     } 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);
Line 329  sub start_hintpart { Line 412  sub start_hintpart {
 sub end_hintpart {  sub end_hintpart {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;      my $result;
     if ($target eq 'edit') { $result.=&Apache::edit::end_table; }      if ($target eq 'edit') {
    $result.=&Apache::edit::end_row().&Apache::edit::end_table();
       }
     return $result;      return $result;
 }  }
   
Line 364  sub end_optionhint { Line 449  sub end_optionhint {
  my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);   my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
  my $partid=$Apache::inputtags::part;   my $partid=$Apache::inputtags::part;
  #id submissions occured under   #id submissions occured under
  my $submitid=$Apache::inputtags::response['-2'];   my $submitid=$Apache::inputtags::response[-1];
  my $part_id="$partid.$submitid";   my $part_id="$partid.$submitid";
  my %answer;   my %answer;
  my $answer=&Apache::lonxml::get_param('answer',$parstack,$safeeval);   my $answer=&Apache::lonxml::get_param('answer',$parstack,$safeeval);
  if ($answer) {   if ($answer) {
     eval('%answer ='.$answer);      eval('%answer ='.$answer);
       &Apache::lonxml::debug("answwer hash");
     &Apache::lonhomework::showhash(%answer);      &Apache::lonhomework::showhash(%answer);
     my $response = $Apache::lonhomework::history{      my $response = $Apache::lonhomework::history{
             "resource.$part_id.submission"};              "resource.$part_id.submission"};
Line 405  sub end_optionhint { Line 491  sub end_optionhint {
      ($foilmatch    eq '-1' || $foilmatch    eq '1') ) {       ($foilmatch    eq '-1' || $foilmatch    eq '1') ) {
     push(@Apache::hint::which,$name);      push(@Apache::hint::which,$name);
  }   }
     } elsif ($target eq 'edit') { $result.=&Apache::edit::end_table; }      } elsif ($target eq 'edit') {
     if ($target eq 'edit') { $result.=&Apache::edit::end_table; }   $result.=&Apache::edit::end_row().&Apache::edit::end_table();
       }
     &Apache::response::end_hintresponse();      &Apache::response::end_hintresponse();
     return $result;      return $result;
 }  }
Line 443  sub end_radiobuttonhint { Line 530  sub end_radiobuttonhint {
  eval('@answer ='.$answer);   eval('@answer ='.$answer);
  my $partid=$Apache::inputtags::part;   my $partid=$Apache::inputtags::part;
  #id submissions occured under   #id submissions occured under
  my $submitid=$Apache::inputtags::response['-2'];   my $submitid=$Apache::inputtags::response[-1];
  my $part_id="$partid.$submitid";   my $part_id="$partid.$submitid";
  my $response = $Apache::lonhomework::history{   my $response = $Apache::lonhomework::history{
     "resource.$part_id.submission"};      "resource.$part_id.submission"};
Line 470  sub end_radiobuttonhint { Line 557  sub end_radiobuttonhint {
  }   }
     }      }
  }   }
     } elsif ($target eq 'edit') { $result.=&Apache::edit::end_table; }      } elsif ($target eq 'edit') {
    $result.=&Apache::edit::end_row().&Apache::edit::end_table();
       }
     &Apache::response::end_hintresponse();      &Apache::response::end_hintresponse();
     return $result;      return $result;
 }  }
Removed from v.1.51  
changed lines
  Added in v.1.63

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