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

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

version 1.50, 2004/03/13 00:36:11 version 1.51, 2004/03/16 19:47:47
Line 158  sub end_numericalhint { Line 158  sub end_numericalhint {
  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::lonnet::EXT('resource.'.$submitid.'_'.$id.'.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 $__LC__'. #'      $$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 $__LC__type="fml";';      $$args_ref{'type'}='fml';
  } elsif ($$tagstack[-1] eq 'numericalhint') {   } elsif ($$tagstack[-1] eq 'numericalhint') {
     $expression.=';my $__LC__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,my @msgs) = &Apache::run::run($expression,$safeeval);   ($result,my @msgs) = &Apache::run::run("&caparesponse_check_list()",
    $safeeval);
  &Apache::lonxml::debug('msgs are'.join(':',@msgs));   &Apache::lonxml::debug('msgs are'.join(':',@msgs));
  &Apache::lonxml::debug("$expression:result:$result:$Apache::lonxml::curdepth");   &Apache::lonxml::debug("result:$result:$Apache::lonxml::curdepth");
  my ($awards)=split(/:/,$result);   my ($awards)=split(/:/,$result);
  my (@awards) = split(/,/,$awards);   my (@awards) = split(/,/,$awards);
  my ($ad, $msg) = &Apache::inputtags::finalizeawards(\@awards,\@msgs);   my ($ad, $msg) = &Apache::inputtags::finalizeawards(\@awards,\@msgs);
Line 193  sub end_numericalhint { Line 198  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::response['-1'];
    #id submissions occured under
    my $submitid=$Apache::inputtags::response['-2'];
    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;
       $result = &Apache::run::run('return $LONCAPA::response=~m'.$answer,$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
Removed from v.1.50  
changed lines
  Added in v.1.51

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