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

Diff for /loncom/homework/hint.pm between versions 1.48 and 1.61

version 1.48, 2004/03/12 18:41:43 version 1.61, 2005/12/01 18:46:31
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::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'));
Line 47  sub start_hintgroup { Line 48  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 85  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 152  sub end_numericalhint { Line 161  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");
  #build safe space expression   my $hideunit=&Apache::response::get_response_param($partid.'_'.$submitid,'turnoffunit');
  my $expression="&caparesponse_check_list('".$response."','".   my $args_ref= \%{$safeeval->varglob('LONCAPA::CAPAresponse_args')};
     $$parstack[$#$parstack];   $$args_ref{'response'}=$response;
  #need to get all possible parms   #need to get all possible parms
    foreach my $arg ('type','tol','sig','ans_fmt','unit','calc',
    'samples') {
       $$args_ref{$arg}=
    &Apache::lonxml::get_param($arg,$parstack,$safeeval);
    }
  foreach my $key (keys(%Apache::inputtags::params)) {   foreach my $key (keys(%Apache::inputtags::params)) {
     $expression.= ';my $'. #'      $$args_ref{$key}=$Apache::inputtags::params{$key};
  $key.'="'.$Apache::inputtags::params{$key}.'"';  
  }   }
    if (lc($hideunit) eq "yes") { delete($$args_ref{'unit'}); }
  if ($$tagstack[-1] eq 'formulahint') {   if ($$tagstack[-1] eq 'formulahint') {
     $expression.=';my $type="fml";';      $$args_ref{'type'}='fml';
  } elsif ($$tagstack[-1] eq 'numericalhint') {   } elsif ($$tagstack[-1] eq 'numericalhint') {
     $expression.=';my $type="float";';      $$args_ref{'type'}='float';
  }   }
  $expression.="');";  
  my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);   my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
  &Apache::lonxml::debug('answer is'.join(':',@answer));   &Apache::lonxml::debug('answer is'.join(':',@answer));
  @{$safeeval->varglob('CAPARESPONSE_CHECK_LIST_answer')}=@answer;   @{$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=@answer;
   
  $result = &Apache::run::run($expression,$safeeval);   ($result,my @msgs) = &Apache::run::run("&caparesponse_check_list()",
  &Apache::lonxml::debug("$expression:result:$result:$Apache::lonxml::curdepth");   $safeeval);
  my ($awards) = split /:/ , $result;   &Apache::lonxml::debug('msgs are'.join(':',@msgs));
  my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);   &Apache::lonxml::debug("result:$result:$Apache::lonxml::curdepth");
    my ($awards)=split(/:/,$result);
    my (@awards) = split(/,/,$awards);
    my ($ad, $msg) = &Apache::inputtags::finalizeawards(\@awards,\@msgs);
  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') {      } elsif ($target eq 'meta') {
Line 191  sub end_numericalhint { Line 207  sub end_numericalhint {
     return $result;      return $result;
 }  }
   
 sub start_stringhint {  sub start_formulahint {
     return &start_numericalhint(@_);      return &start_numericalhint(@_);
 }  }
   
 sub end_stringhint {  sub end_formulahint {
     return &end_numericalhint(@_);      return &end_numericalhint(@_);
 }  }
   
 sub start_formulahint {  sub start_stringhint {
     return &start_numericalhint(@_);      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       #do everything in end, so intervening <responseparams> work
       &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::select_arg('Type:','type',
    [['cs','Case Sensitive'],['ci','Case Insensitive'],
     ['mc','Case Insensitive, Any Order'],
     ['re','Regular Expression']],$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','answer',
     'type');
    $result  = &Apache::edit::rebuild_tag($token);
    $result .= &Apache::edit::handle_insert();
       } elsif ($target eq 'web') {
    &Apache::response::reset_params();
       }
       return $result;
 }  }
   
 sub end_formulahint {  sub end_stringhint {
     return end_numericalhint(@_);      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 $answer=&Apache::lonxml::get_param('answer',$parstack,$safeeval);
    $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
    my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
    &Apache::response::setup_params('stringhint',$safeeval);
    my $partid=$Apache::inputtags::part;
    my $id=$Apache::inputtags::hint[-1];
    #id submissions occured under
    my $submitid=$Apache::inputtags::response[-1];
    my $response = $Apache::lonhomework::history{
       "resource.$partid.$submitid.submission"};
    &Apache::lonxml::debug("hintgroup is using $response<br />\n");
    my $args_ref= \%{$safeeval->varglob('LONCAPA::CAPAresponse_args')};
    $$args_ref{'response'}=$response;
    my $type=$$args_ref{'type'}=&Apache::lonxml::get_param('type',$parstack,$safeeval);
    my ($ad,$msg);
    if ($type eq 're' ) {
       ${$safeeval->varglob('LONCAPA::response')}=$response;
       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 $answer");
       $ad = ($result) ? 'APPROX_ANS' : 'INCORRECT';
    } else { 
       foreach my $key (keys(%Apache::inputtags::params)) {
    $$args_ref{$key}=$Apache::inputtags::params{$key};
       }
       &Apache::lonxml::debug('answer is'.$answer);
       @{$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=($answer);
       
       ($result,my @msgs)=&Apache::run::run("&caparesponse_check_list()",
      $safeeval);
       &Apache::lonxml::debug('msgs are'.join(':',@msgs));
       &Apache::lonxml::debug("result:$result:$Apache::lonxml::curdepth");
       my ($awards)=split(/:/,$result);
       my (@awards) = split(/,/,$awards);
       ($ad, $msg) = &Apache::inputtags::finalizeawards(\@awards,\@msgs);
    }
    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;
       }
       &Apache::response::end_hintresponse();
       return $result;
 }  }
   
 # 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
Line 223  sub start_hintpart { Line 322  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 281  sub end_optionhint { Line 380  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);
Line 360  sub end_radiobuttonhint { Line 459  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"};
Removed from v.1.48  
changed lines
  Added in v.1.61

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