[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.101 and 1.105

version 1.101, 2003/05/14 13:33:00 version 1.105, 2003/06/24 20:41:56
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 309  sub end_numericalresponse { Line 313  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 321  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.answer_output_mode'} eq 'tex') {      if ($ENV{'form.answer_output_mode'} eq 'tex') {
  $ans.= " Sig \\textit{$siglow - $sighigh}";   $ans.= " Sig \\textit{$siglow - $sighigh}";
     } else {      } else {
Line 334  sub end_numericalresponse { Line 338  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.answer_output_mode'} eq 'tex') {   if ($ENV{'form.answer_output_mode'} eq 'tex') {
     $result.=&Apache::response::answer_part($$tagstack[-1],      $result.=&Apache::response::answer_part($$tagstack[-1],
Line 344  sub end_numericalresponse { Line 349  sub end_numericalresponse {
     "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 368  sub end_numericalresponse { Line 372  sub end_numericalresponse {
     "<b>$string</b>");      "<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 494  sub start_stringresponse { Line 498  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 509  sub start_formularesponse { Line 515  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.101  
changed lines
  Added in v.1.105

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