[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.100 and 1.111

version 1.100, 2003/05/13 20:39:58 version 1.111, 2003/09/22 18:38:59
Line 150  sub end_numericalresponse { Line 150  sub end_numericalresponse {
     $expression.=';my $type="float";';      $expression.=';my $type="float";';
  }   }
  $expression.="');";   $expression.="');";
    my @answer=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
    &Apache::lonxml::debug('answer is'.join(':',@answer));
    @{$safeeval->varglob('CAPARESPONSE_CHECK_LIST_answer')}=@answer;
   
  $result = &Apache::run::run($expression,$safeeval);   $result = &Apache::run::run($expression,$safeeval);
  my ($awards) = split /:/ , $result;   my ($awards) = split /:/ , $result;
  ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);   ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
Line 190  sub end_numericalresponse { Line 194  sub end_numericalresponse {
  }   }
  my $formatted;   my $formatted;
  if ((defined($format)) && ($format ne '')) {   if ((defined($format)) && ($format ne '')) {
       $format=~s/e/E/g;
     &Apache::lonxml::debug("formatting with :$format: answer :$answer:");      &Apache::lonxml::debug("formatting with :$format: answer :$answer:");
     $formatted=sprintf('%.'.$format,$answer).',';      $formatted=sprintf('%.'.$format,$answer).',';
  } else {   } else {
Line 243  sub end_numericalresponse { Line 248  sub end_numericalresponse {
                            </textarea></font> <br /><br />';                             </textarea></font> <br /><br />';
  }   }
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  if (defined $unit and $Apache::lonhomework::type eq 'exam') {   if ((defined $unit) and ($unit=~/\S/) and ($Apache::lonhomework::type eq 'exam')) {
     $result.=' \textit{(in} \verb|'.$unit.'|\textit{)} ';      $result.=' \textit{(in} \verb|'.$unit.'|\textit{)} ';
  }   }
  if ($$tagstack[-1] eq 'numericalresponse') {   if ($$tagstack[-1] eq 'numericalresponse') {
Line 309  sub end_numericalresponse { Line 314  sub end_numericalresponse {
     if ($Apache::inputtags::params{'sig'}) {      if ($Apache::inputtags::params{'sig'}) {
  ($sighigh,$siglow)=&get_sigrange($Apache::inputtags::params{'sig'});   ($sighigh,$siglow)=&get_sigrange($Apache::inputtags::params{'sig'});
     }      }
     if ($fmt) {      if ($fmt && $$tagstack[-1] eq 'numericalresponse') {
  $ans = sprintf('%.'.$fmt,$ans);   $ans = sprintf('%.'.$fmt,$ans);
  if ($high) {   if ($high) {
     $high=sprintf('%.'.$fmt,$high);      $high=sprintf('%.'.$fmt,$high);
Line 317  sub end_numericalresponse { Line 322  sub end_numericalresponse {
  }   }
     }      }
     if ($target eq 'answer') {      if ($target eq 'answer') {
  if ($high) { $ans.=' ['.$low.','.$high.']'; }   if ($high && $$tagstack[-1] eq 'numericalresponse') { $ans.=' ['.$low.','.$high.']'; }
  if ($sighigh) {    if ($sighigh && $$tagstack[-1] eq 'numericalresponse') {
     if ($ENV{'form.print_answer'} eq 'yes') {      if ($ENV{'form.answer_output_mode'} eq 'tex') {
  $ans.= " Sig \\textit{$siglow - $sighigh}";    $ans.= " Sig $siglow - $sighigh";
     } else {      } else {
  $ans.= " Sig <i>$siglow - $sighigh</i>";    $ans.= " Sig <i>$siglow - $sighigh</i>";
     }      }
  }   }
  $result.=&Apache::response::answer_part($$tagstack[-1],$ans);   $result.=&Apache::response::answer_part($$tagstack[-1],$ans);
Line 334  sub end_numericalresponse { Line 339  sub end_numericalresponse {
  }   }
     }      }
  }   }
  if ($unit) {   if (defined($unit) and ($unit ne '') and
       $$tagstack[-1] eq 'numericalresponse') {
     if ($target eq 'answer') {      if ($target eq 'answer') {
  if ($ENV{'form.print_answer'} eq 'yes') {   if ($ENV{'form.answer_output_mode'} eq 'tex') {
     $result.=&Apache::response::answer_part($$tagstack[-1],      $result.=&Apache::response::answer_part($$tagstack[-1],
     "Unit: \\verb|$unit|");      " Unit: $unit ");
  } else {   } else {
     $result.=&Apache::response::answer_part($$tagstack[-1],      $result.=&Apache::response::answer_part($$tagstack[-1],
     "Unit: <b>$unit</b>");      "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);  
     }      }
  }   }
  if ($type || $token->[1] eq 'stringresponse') {   if ($type || $$tagstack[-1] eq 'stringresponse') {
     my $string='Case Insensitive';      my $string='Case Insensitive';
     if ($type eq 'mc') {      if ($type eq 'mc') {
  $string='Multiple Choice';   $string='Multiple Choice';
Line 360  sub end_numericalresponse { Line 365  sub end_numericalresponse {
  $string='Formula';   $string='Formula';
     }      }
     if ($target eq 'answer') {      if ($target eq 'answer') {
  $result.=&Apache::response::answer_part($$tagstack[-1],   if ($ENV{'form.answer_output_mode'} eq 'tex') {
  '<b>'.$string.'</b>');      $result.=&Apache::response::answer_part($$tagstack[-1],
     "$string");
    } else {
       $result.=&Apache::response::answer_part($$tagstack[-1],
       "<b>$string</b>");
    }
     } elsif ($target eq 'analyze') {      } elsif ($target eq 'analyze') {
  push (@{ $Apache::lonhomework::analyze{"$part_id.type"} },   push (@{ $Apache::lonhomework::analyze{"$part_id.str_type"} },
       $type);        $type);
     }      }
  }   }
Line 407  sub format_number { Line 417  sub format_number {
     my ($number,$format,$target)=@_;      my ($number,$format,$target)=@_;
     my $ans;      my $ans;
     if ($format ne '') {      if ($format ne '') {
    $format=~s/e/E/g;
  $ans = sprintf('%.'.$format,$number);   $ans = sprintf('%.'.$format,$number);
     } else {      } else {
  my $format = '';   my $format = '';
  #What is the number? (integer,decimal,floating point)   #What is the number? (integer,decimal,floating point)
  if ($number=~/^(\d*\.?\d*)(E|e)(\d*)$/) {   if ($number=~/^(\d*\.?\d*)(E|e)(\d*)$/) {
     $format = 'e'.$2;      if (abs($3)>=100) {$format = 'e3';} else {$format = 'e2';}
  } elsif ($number=~/^(\d*)\.(\d*)$/) {   } elsif ($number=~/^(\d*)\.(\d*)$/) {
     $format = '4f';      $format = '4f';
  } elsif ($number=~/^(\d*)$/) {   } elsif ($number=~/^(\d*)$/) {
Line 489  sub start_stringresponse { Line 500  sub start_stringresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      my $result;
     if ($target eq 'meta') {      if ($target eq 'meta') {
    &Apache::response::start_response($parstack,$safeeval);
  $result=&Apache::response::meta_package_write('stringresponse');   $result=&Apache::response::meta_package_write('stringresponse');
    &Apache::response::end_response();
     } else {      } else {
  $result.=&start_numericalresponse(@_);   $result.=&start_numericalresponse(@_);
     }      }
Line 504  sub start_formularesponse { Line 517  sub start_formularesponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      my $result;
     if ($target eq 'meta') {      if ($target eq 'meta') {
    &Apache::response::start_response($parstack,$safeeval);
  $result=&Apache::response::meta_package_write('formularesponse');   $result=&Apache::response::meta_package_write('formularesponse');
    &Apache::response::end_response();
     } else {      } else {
  $result.=&start_numericalresponse(@_);   $result.=&start_numericalresponse(@_);
     }      }
Removed from v.1.100  
changed lines
  Added in v.1.111

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