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

Diff for /loncom/homework/caparesponse/caparesponse.pm between versions 1.95 and 1.100

version 1.95, 2003/04/21 20:59:02 version 1.100, 2003/05/13 20:39:58
Line 79  sub start_numericalresponse { Line 79  sub start_numericalresponse {
  $result=&Apache::response::meta_package_write('numericalresponse');   $result=&Apache::response::meta_package_write('numericalresponse');
     } elsif ($target eq 'answer' || $target eq 'grade') {      } elsif ($target eq 'answer' || $target eq 'grade') {
  &Apache::response::reset_params();   &Apache::response::reset_params();
       } elsif ($target eq 'web') {
    my $partid = $Apache::inputtags::part;
    my $hideunit=&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffunit');
    &Apache::lonxml::debug("Got unit $hideunit for $partid $id");
    #no way to enter units, with radio buttons
    if (lc($hideunit) eq "yes") {
       my $unit=&Apache::lonxml::get_param_var('unit',$parstack,
       $safeeval);
       if ($unit =~ /\S/) { $result.=" (in $unit) "; }
    }
     }      }
     return $result;      return $result;
 }  }
Line 124  sub end_numericalresponse { Line 134  sub end_numericalresponse {
  &Apache::lonxml::debug("current $response");   &Apache::lonxml::debug("current $response");
  my $expression="&caparesponse_check_list('".$response."','".   my $expression="&caparesponse_check_list('".$response."','".
     $$parstack[-1];      $$parstack[-1];
    my $hideunit=&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffunit');
  #no way to enter units, with radio buttons   #no way to enter units, with radio buttons
  if ($Apache::lonhomework::type eq 'exam') {   if ($Apache::lonhomework::type eq 'exam' ||
       lc($hideunit) eq "yes") {
     $expression.=';my $unit=undef;';      $expression.=';my $unit=undef;';
  }   }
  foreach my $key (keys(%Apache::inputtags::params)) {   foreach my $key (keys(%Apache::inputtags::params)) {
Line 153  sub end_numericalresponse { Line 165  sub end_numericalresponse {
      $safeeval);       $safeeval);
  my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};   my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
  my $status = $Apache::inputtags::status['-1'];   my $status = $Apache::inputtags::status['-1'];
  if ($award =~ /^correct/ || $status eq "SHOW_ANSWER" || $ENV{'form.texaward'} eq 'SHOW_ANSWER') {   if (   ($award =~ /^correct/
                   && lc($Apache::lonhomework::problemstatus) ne 'no')
                || $status eq "SHOW_ANSWER"
                || $ENV{'form.texaward'} eq 'SHOW_ANSWER') {
     my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,      my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,
  $safeeval);   $safeeval);
     my $unit=&Apache::lonxml::get_param_var('unit',$parstack,      my $unit=&Apache::lonxml::get_param_var('unit',$parstack,
Line 303  sub end_numericalresponse { Line 318  sub end_numericalresponse {
     }      }
     if ($target eq 'answer') {      if ($target eq 'answer') {
  if ($high) { $ans.=' ['.$low.','.$high.']'; }   if ($high) { $ans.=' ['.$low.','.$high.']'; }
  if ($sighigh) { $ans.= " Sig <i>$siglow - $sighigh</i>"; }   if ($sighigh) { 
       if ($ENV{'form.print_answer'} eq 'yes') {
    $ans.= " Sig \\textit{$siglow - $sighigh}"; 
       } else {
    $ans.= " Sig <i>$siglow - $sighigh</i>"; 
       }
    }
  $result.=&Apache::response::answer_part($$tagstack[-1],$ans);   $result.=&Apache::response::answer_part($$tagstack[-1],$ans);
     } elsif ($target eq 'analyze') {      } elsif ($target eq 'analyze') {
  push (@{ $Apache::lonhomework::analyze{"$part_id.answer"} }, $ans);   push (@{ $Apache::lonhomework::analyze{"$part_id.answer"} }, $ans);
Line 315  sub end_numericalresponse { Line 336  sub end_numericalresponse {
  }   }
  if ($unit) {   if ($unit) {
     if ($target eq 'answer') {      if ($target eq 'answer') {
  $result.=&Apache::response::answer_part($$tagstack[-1],   if ($ENV{'form.print_answer'} eq 'yes') {
  "Unit: <b>$unit</b>");      $result.=&Apache::response::answer_part($$tagstack[-1],
       "Unit: \\verb|$unit|");
    } else {
       $result.=&Apache::response::answer_part($$tagstack[-1],
       "Unit: <b>$unit</b>");
    }
     } elsif ($target eq 'analyze') {      } elsif ($target eq 'analyze') {
  push (@{ $Apache::lonhomework::analyze{"$part_id.unit"} },   push (@{ $Apache::lonhomework::analyze{"$part_id.unit"} },
       $unit);        $unit);
Removed from v.1.95  
changed lines
  Added in v.1.100

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