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

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

version 1.62.2.1, 2006/12/19 00:52:44 version 1.63, 2006/12/18 21:12:51
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::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'));      &Apache::lonxml::register('Apache::hinttags',('hintgroup','hintpart','numericalhint','stringhint','formulahint','optionhint','radiobuttonhint','mathhint'));
 }  }
   
   
Line 110  sub start_numericalhint { Line 108  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);
     &Apache::caparesponse::push_answer();  
     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);
Line 121  sub start_numericalhint { Line 118  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',      $result.=&Apache::edit::text_arg('Sample Points:','samples',$token,40);
      $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 134  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 157  sub end_numericalhint { Line 160  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 $hint_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::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';
  }   }
  &Apache::caparesponse::add_in_tag_answer($parstack,$safeeval);   my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
  my %answer = &Apache::caparesponse::get_answer();   &Apache::lonxml::debug('answer is'.join(':',@answer));
  my (@final_awards,@final_msgs,@ans_names);   @{$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=@answer;
  foreach my $ans_name (keys(%answer)) {  
     &Apache::lonxml::debug(" doing $ans_name with ".join(':',@{ $answer{$ans_name}{'answers'} }));   ($result,my @msgs) = &Apache::run::run("&caparesponse_check_list()",
    $safeeval);
     ${$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=   &Apache::lonxml::debug('msgs are'.join(':',@msgs));
  dclone($answer{$ans_name});   &Apache::lonxml::debug("result:$result:$Apache::lonxml::curdepth");
     &Apache::caparesponse::setup_capa_response($args_ref,$response);   my ($awards)=split(/:/,$result);
     my ($result,@msgs) =    my (@awards) = split(/,/,$awards);
  &Apache::run::run("&caparesponse_check_list()",$safeeval);   my ($ad, $msg) = &Apache::inputtags::finalizeawards(\@awards,\@msgs);
     &Apache::lonxml::debug("checking $ans_name $result with $response");   if ($ad eq 'EXACT_ANS' || $ad eq 'APPROX_ANS') { push (@Apache::hint::which,$name); }
     &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]);
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result.=&Apache::edit::end_row().&Apache::edit::end_table();   $result.=&Apache::edit::end_row().&Apache::edit::end_table();
     }      }
     &Apache::caparesponse::pop_answer();  
     &Apache::response::end_hintresponse();      &Apache::response::end_hintresponse();
     return $result;      return $result;
 }  }
Line 229  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 264  sub end_stringhint { Line 317  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 $hint_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::hint[-1];   my $id=$Apache::inputtags::hint[-1];
Line 274  sub end_stringhint { Line 328  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 $type = &Apache::lonxml::get_param('type',$parstack,$safeeval);   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);   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 292  sub end_stringhint { Line 346  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 { 
     my @args = ('type');      foreach my $key (keys(%Apache::inputtags::params)) {
     my $args_ref =    $$args_ref{$key}=$Apache::inputtags::params{$key};
  &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");  
     }      }
     my ($ad, $msg, $ans_name) =       &Apache::lonxml::debug('answer is'.$answer);
  &Apache::inputtags::finalizeawards(\@final_awards,      @{$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=($answer);
    \@final_msgs,      
    \@ans_names,1);      ($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') {    if ($ad eq 'EXACT_ANS' || $ad eq 'APPROX_ANS') { 
     push(@Apache::hint::which,$hint_name);      push (@Apache::hint::which,$name);
  }   }
  $result='';   $result='';
     } elsif ($target eq 'meta') {      } elsif ($target eq 'meta') {
Removed from v.1.62.2.1  
changed lines
  Added in v.1.63

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