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

Diff for /loncom/homework/hint.pm between versions 1.64 and 1.65

version 1.64, 2006/12/18 21:37:47 version 1.65, 2006/12/19 00:40:38
Line 29 Line 29
 package Apache::hinttags;   package Apache::hinttags; 
   
 use strict;  use strict;
 use Apache::lonnet;  use Apache::lonnet();
 use capa;  use capa;
   use Apache::caparesponse();
 use Apache::lonmaxima();  use Apache::lonmaxima();
 use Apache::response();  use Apache::response();
 use Apache::lonlocal;  use Apache::lonlocal;
   use Storable qw(dclone);
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::hinttags',('hintgroup','hintpart','numericalhint','stringhint','formulahint','optionhint','radiobuttonhint','mathhint','customhint'));      &Apache::lonxml::register('Apache::hinttags',('hintgroup','hintpart','numericalhint','stringhint','formulahint','optionhint','radiobuttonhint','mathhint','customhint'));
Line 118  sub start_numericalhint { Line 120  sub start_numericalhint {
  &Apache::loncommon::help_open_topic('Physical_Units');   &Apache::loncommon::help_open_topic('Physical_Units');
     $result.=&Apache::edit::text_arg('Format:','format',$token,4).      $result.=&Apache::edit::text_arg('Format:','format',$token,4).
  &Apache::loncommon::help_open_topic('Numerical_Response_Format');   &Apache::loncommon::help_open_topic('Numerical_Response_Format');
  } elsif ($token->[1] eq 'stringhint') {  
     $result.=&Apache::edit::select_arg('Type:','type',  
     [['cs','Case Sensitive'],['ci','Case Insensitive'],  
      ['mc','Case Insensitive, Any Order']],$token);  
  } elsif ($token->[1] eq 'formulahint') {   } elsif ($token->[1] eq 'formulahint') {
     $result.=&Apache::edit::text_arg('Sample Points:','samples',$token,40);      $result.=&Apache::edit::text_arg('Sample Points:','samples',
        $token,40).
           &Apache::loncommon::help_open_topic('Formula_Response_Sampling');
  }   }
  $result.=&Apache::edit::end_row();   $result.=&Apache::edit::end_row();
  $result.=&Apache::edit::start_spanning_row();   $result.=&Apache::edit::start_spanning_row();
Line 133  sub start_numericalhint { Line 133  sub start_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');
  } elsif ($token->[1] eq 'stringhint') {  
     $constructtag=&Apache::edit::get_new_args($token,$parstack,  
      $safeeval,'name','answer',  
      'type');  
  } 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',
Line 160  sub end_numericalhint { Line 156  sub end_numericalhint {
     &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 $hint_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::hint[-1];   my $id=$Apache::inputtags::hint[-1];
  #id submissions occured under   #id submissions occured under
  my $submitid=$Apache::inputtags::response[-1];   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 @args = ('type','tol','sig','ans_fmt','unit','calc','samples');
    my $args_ref =
       &Apache::caparesponse::setup_capa_args($safeeval,$parstack,
      \@args,$response);
   
  my $hideunit=&Apache::response::get_response_param($partid.'_'.$submitid,'turnoffunit');   my $hideunit=&Apache::response::get_response_param($partid.'_'.$submitid,'turnoffunit');
  my $args_ref= \%{$safeeval->varglob('LONCAPA::CAPAresponse_args')};  
  $$args_ref{'response'}=$response;  
  #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)) {  
     $$args_ref{$key}=$Apache::inputtags::params{$key};  
  }  
  if (lc($hideunit) eq "yes") { delete($$args_ref{'unit'}); }   if (lc($hideunit) eq "yes") { delete($$args_ref{'unit'}); }
   
  if ($$tagstack[-1] eq 'formulahint') {   if ($$tagstack[-1] eq 'formulahint') {
     $$args_ref{'type'}='fml';      $$args_ref{'type'}='fml';
  } elsif ($$tagstack[-1] eq 'numericalhint') {   } elsif ($$tagstack[-1] eq 'numericalhint') {
     $$args_ref{'type'}='float';      $$args_ref{'type'}='float';
  }   }
  my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);   &Apache::caparesponse::add_in_tag_answer($parstack,$safeeval);
  &Apache::lonxml::debug('answer is'.join(':',@answer));   my %answer = &Apache::caparesponse::get_answer();
  @{$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=@answer;   my (@final_awards,@final_msgs,@ans_names);
    foreach my $ans_name (keys(%answer)) {
  ($result,my @msgs) = &Apache::run::run("&caparesponse_check_list()",      &Apache::lonxml::debug(" doing $ans_name with ".join(':',@{ $answer{$ans_name}{'answers'} }));
  $safeeval);  
  &Apache::lonxml::debug('msgs are'.join(':',@msgs));      ${$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=
  &Apache::lonxml::debug("result:$result:$Apache::lonxml::curdepth");   dclone($answer{$ans_name});
  my ($awards)=split(/:/,$result);      &Apache::caparesponse::setup_capa_response($args_ref,$response);
  my (@awards) = split(/,/,$awards);      my ($result,@msgs) = 
  my ($ad, $msg) = &Apache::inputtags::finalizeawards(\@awards,\@msgs);   &Apache::run::run("&caparesponse_check_list()",$safeeval);
  if ($ad eq 'EXACT_ANS' || $ad eq 'APPROX_ANS') { push (@Apache::hint::which,$name); }      &Apache::lonxml::debug("checking $ans_name $result with $response");
       &Apache::lonxml::debug('msgs are '.join(':',@msgs));
       my ($awards)=split(/:/,$result);
       my @awards= split(/,/,$awards);
       my ($ad, $msg) = 
    &Apache::inputtags::finalizeawards(\@awards,\@msgs);
       push(@final_awards,$ad);
       push(@final_msgs,$msg);
       push(@ans_names,$ans_name);
    }
    my ($ad, $msg, $ans_name) =
       &Apache::inputtags::finalizeawards(\@final_awards,
          \@final_msgs,
          \@ans_names,1);
    if ($ad eq 'EXACT_ANS' || $ad eq 'APPROX_ANS') {
       push(@Apache::hint::which,$hint_name);
    }
  $result='';   $result='';
     } elsif ($target eq 'meta') {      } elsif ($target eq 'meta') {
  $result=&Apache::response::meta_package_write($token->[1]);   $result=&Apache::response::meta_package_write($token->[1]);
Line 379  sub end_stringhint { Line 389  sub end_stringhint {
  if (!$Apache::lonxml::default_homework_loaded) {   if (!$Apache::lonxml::default_homework_loaded) {
     &Apache::lonxml::default_homework_load($safeeval);      &Apache::lonxml::default_homework_load($safeeval);
  }   }
  my $answer=&Apache::lonxml::get_param('answer',$parstack,$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 $hint_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::hint[-1];   my $id=$Apache::inputtags::hint[-1];
Line 390  sub end_stringhint { Line 399  sub end_stringhint {
  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 $args_ref= \%{$safeeval->varglob('LONCAPA::CAPAresponse_args')};   my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval);
  $$args_ref{'response'}=$response;  
  my $type=$$args_ref{'type'}=&Apache::lonxml::get_param('type',$parstack,$safeeval);  
  my ($ad,$msg);   my ($ad,$msg);
  if ($type eq 're' ) {   if ($type eq 're' ) {
       my $answer=&Apache::lonxml::get_param('answer',$parstack,
     $safeeval);
     ${$safeeval->varglob('LONCAPA::response')}=$response;      ${$safeeval->varglob('LONCAPA::response')}=$response;
     my $compare='=';      my $compare='=';
     if ($answer=~/^\s*NOT\s*/) {      if ($answer=~/^\s*NOT\s*/) {
Line 408  sub end_stringhint { Line 417  sub end_stringhint {
     &Apache::lonxml::debug("current $answer");      &Apache::lonxml::debug("current $answer");
     $ad = ($result) ? 'APPROX_ANS' : 'INCORRECT';      $ad = ($result) ? 'APPROX_ANS' : 'INCORRECT';
  } else {    } else { 
     foreach my $key (keys(%Apache::inputtags::params)) {      my @args = ('type');
  $$args_ref{$key}=$Apache::inputtags::params{$key};      my $args_ref = 
    &Apache::caparesponse::setup_capa_args($safeeval,$parstack,
          \@args,$response);
       &Apache::caparesponse::add_in_tag_answer($parstack,$safeeval);
       my (@final_awards,@final_msgs,@ans_names);
       my %answer = &Apache::caparesponse::get_answer();
       foreach my $ans_name (keys(%answer)) {
    &Apache::lonxml::debug(" doing $ans_name with ".join(':',@{ $answer{$ans_name}{'answers'} }));
    ${$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=dclone($answer{$ans_name});
    my ($result, @msgs)=&Apache::run::run("&caparesponse_check_list()",$safeeval);
    &Apache::lonxml::debug('msgs are'.join(':',@msgs));
    my ($awards) = split(/:/,$result);
    my (@awards) = split(/,/,$awards);
    ($ad,$msg) = 
       &Apache::inputtags::finalizeawards(\@awards,\@msgs);
    push(@final_awards,$ad);
    push(@final_msgs,$msg);
    push(@ans_names,$ans_name);
    &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
     }      }
     &Apache::lonxml::debug('answer is'.$answer);      my ($ad, $msg, $ans_name) = 
     @{$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=($answer);   &Apache::inputtags::finalizeawards(\@final_awards,
          \@final_msgs,
     ($result,my @msgs)=&Apache::run::run("&caparesponse_check_list()",     \@ans_names,1);
    $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') {    if ($ad eq 'EXACT_ANS' || $ad eq 'APPROX_ANS') { 
     push (@Apache::hint::which,$name);      push(@Apache::hint::which,$hint_name);
  }   }
  $result='';   $result='';
     } elsif ($target eq 'meta') {      } elsif ($target eq 'meta') {
Removed from v.1.64  
changed lines
  Added in v.1.65

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