[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.47 and 1.52

version 1.47, 2001/12/04 15:17:57 version 1.52, 2002/04/11 19:48:16
Line 30  package Apache::caparesponse; Line 30  package Apache::caparesponse;
 use strict;  use strict;
 use capa;  use capa;
   
 sub BEGIN {  BEGIN {
   &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse','stringresponse','formularesponse'));    &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse','stringresponse','formularesponse'));
 }  }
   
Line 82  sub start_numericalresponse { Line 82  sub start_numericalresponse {
   my $id = &Apache::response::start_response($parstack,$safeeval);    my $id = &Apache::response::start_response($parstack,$safeeval);
   my $result;    my $result;
   if ($target eq 'edit') {    if ($target eq 'edit') {
     $result.=&Apache::edit::tag_start($target,$token,&Apache::lonxml::description($token));      $result.=&Apache::edit::tag_start($target,$token);
     $result.=&Apache::edit::text_arg('Answer:','answer',$token);      $result.=&Apache::edit::text_arg('Answer:','answer',$token);
     if ($token->[1] eq 'numericalresponse') {      if ($token->[1] eq 'numericalresponse') {
       $result.=&Apache::edit::text_arg('Unit:','unit',$token,5);        $result.=&Apache::edit::text_arg('Unit:','unit',$token,5);
       $result.=&Apache::edit::text_arg('Format:','format',$token,4);        $result.=&Apache::edit::text_arg('Format:','format',$token,4);
     } elsif ($token->[1] eq 'stringresponse') {      } elsif ($token->[1] eq 'stringresponse') {
       $result.=&Apache::edit::select_arg('Type:','type',        $result.=&Apache::edit::select_arg('Type:','type',
  ['cs','ci','mc'],$token)   ['cs','ci','mc'],$token);
     } elsif ($token->[1] eq 'formularesponse') {      } elsif ($token->[1] eq 'formularesponse') {
       $result.=&Apache::edit::text_arg('Sample Points:','samples',$token,40);        $result.=&Apache::edit::text_arg('Sample Points:','samples',$token,40);
     }      }
     $result.='</td></tr><tr><td colspan="3">';      $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
   } elsif ($target eq 'modified') {    } elsif ($target eq 'modified') {
     my $constructtag;      my $constructtag;
     if ($token->[1] eq 'numericalresponse') {      if ($token->[1] eq 'numericalresponse') {
Line 149  sub end_numericalresponse { Line 149  sub end_numericalresponse {
  $result = &Apache::run::run($expression,$safeeval);   $result = &Apache::run::run($expression,$safeeval);
  my ($awards) = split /:/ , $result;   my ($awards) = split /:/ , $result;
  my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);   my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
  if ( $previous{'used'} && ($previous{'award'} eq $ad) ) {   &Apache::response::handle_previous(\%previous,$ad);
   if ($previous{'last'}) {  
     push(@Apache::inputtags::previous,'PREVIOUSLY_LAST');  
   } else {  
     push(@Apache::inputtags::previous,'PREVIOUSLY_USED');  
   }  
  }  
  $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;   $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
  &Apache::lonxml::debug("$expression");   &Apache::lonxml::debug("$expression");
  &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");   &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
Line 197  sub end_numericalresponse { Line 191  sub end_numericalresponse {
     $result.='</td></tr>'.&Apache::edit::end_table;      $result.='</td></tr>'.&Apache::edit::end_table;
   } elsif ($target eq 'answer') {    } elsif ($target eq 'answer') {
   
       &Apache::response::setup_params($$tagstack[-1]);
     my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);      my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
     my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);      my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);
     my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval);      my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval);
Line 213  sub end_numericalresponse { Line 208  sub end_numericalresponse {
   $fmt=$formats[0];    $fmt=$formats[0];
  }   }
       }        }
       if ($fmt) { $ans = sprintf('%.'.$fmt,$ans); }        my ($high,$low);
         if ($Apache::inputtags::params{'tol'}) {
    ($high,$low)=&get_tolrange($ans,$Apache::inputtags::params{'tol'});
         }
         my ($sighigh,$siglow);
         if ($Apache::inputtags::params{'sig'}) {
    ($sighigh,$siglow)=&get_sigrange($Apache::inputtags::params{'sig'});
         }
         if ($fmt) {
    $ans = sprintf('%.'.$fmt,$ans);
    if ($high) {
     $high = sprintf('%.'.$fmt,$high); $low = sprintf('%.'.$fmt,$low);
    }
         }
         if ($high) { $ans.=' ['.$low.','.$high.'] '; }
         if ($sighigh) { $ans.= "Sig <i>$siglow - $sighigh</i>"; }
       $result.=&Apache::response::answer_part($$tagstack[-1],$ans);        $result.=&Apache::response::answer_part($$tagstack[-1],$ans);
     }      }
     if ($unit) {      if ($unit) {
       $result.=&Apache::response::answer_part($$tagstack[-1],        $result.=&Apache::response::answer_part($$tagstack[-1],"Unit: <b>$unit</b>");
       '<b>'.$unit.'</b>');  
     }      }
     if ($type || $token->[1] eq 'stringresponse') {      if ($type || $token->[1] eq 'stringresponse') {
       my $string='Case Insensitive';        my $string='Case Insensitive';
Line 244  sub end_numericalresponse { Line 253  sub end_numericalresponse {
   return $result;    return $result;
 }  }
   
   sub get_tolrange {
     my ($ans,$tol)=@_;
     my ($high,$low);
     if ($tol =~ /%$/) {
       chop($tol);
       my $change=$ans*($tol/100.0);
       $high=$ans+$change;
       $low=$ans-$change;
     } else {
       $high=$ans+$tol;
       $low=$ans-$tol;
     }
     return ($high,$low);
   }
   
   sub get_sigrange {
     my ($sig)=@_;
     &Apache::lonxml::debug("Got a sig of :$sig:");
     my $sig_lbound;
     my $sig_ubound;
     if ($sig eq '') {
       $sig_lbound = 0; #SIG_LB_DEFAULT
       $sig_ubound =15; #SIG_UB_DEFAULT
     } else {
       ($sig_lbound,$sig_ubound) = split(/,/,$sig);
       if (!$sig_lbound) {
         $sig_lbound = 0; #SIG_LB_DEFAULT
         $sig_ubound =15; #SIG_UB_DEFAULT
       }
       if (!$sig_ubound) { $sig_ubound=$sig_lbound; }
     }
     return ($sig_ubound,$sig_lbound);
   }
   
 sub start_stringresponse {  sub start_stringresponse {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $result;    my $result;
Removed from v.1.47  
changed lines
  Added in v.1.52

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