[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.43 and 1.46

version 1.43, 2001/09/18 02:21:13 version 1.46, 2001/12/04 14:54:47
Line 6  use strict; Line 6  use strict;
 use capa;  use capa;
   
 sub BEGIN {  sub BEGIN {
   &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse','stringresponse'));    &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse','stringresponse','formularesponse'));
 }  }
   
 sub start_caparesponse {  sub start_caparesponse {
Line 62  sub start_numericalresponse { Line 62  sub start_numericalresponse {
     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);
     } else {      } 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') {
         $result.=&Apache::edit::text_arg('Sample Points:','samples',$token,40);
     }      }
     $result.='</td></tr><tr><td colspan="3">';      $result.='</td></tr><tr><td colspan="3">';
   } elsif ($target eq 'modified') {    } elsif ($target eq 'modified') {
Line 72  sub start_numericalresponse { Line 74  sub start_numericalresponse {
     if ($token->[1] eq 'numericalresponse') {      if ($token->[1] eq 'numericalresponse') {
       $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,        $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
  'answer','unit','format');   'answer','unit','format');
     } else {      } elsif ($token->[1] eq 'stringresponse') {
       $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,        $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
  'answer','type');   'answer','type');
       } elsif ($token->[1] eq 'formularesponse') {
         $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
    'answer','samples');
     }      }
     if ($constructtag) {      if ($constructtag) {
       $result = &Apache::edit::rebuild_tag($token);        $result = &Apache::edit::rebuild_tag($token);
Line 91  sub end_numericalresponse { Line 96  sub end_numericalresponse {
   my $result = '';    my $result = '';
   if ( $target eq 'grade' ) {    if ( $target eq 'grade' ) {
     if ( defined $ENV{'form.submitted'}) {      if ( defined $ENV{'form.submitted'}) {
       &Apache::response::setup_params('numericalresponse');        &Apache::response::setup_params($$tagstack[-1]);
       $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);        $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
       my $partid = $Apache::inputtags::part;        my $partid = $Apache::inputtags::part;
       my $id = $Apache::inputtags::response['-1'];        my $id = $Apache::inputtags::response['-1'];
Line 110  sub end_numericalresponse { Line 115  sub end_numericalresponse {
   $expression.= ';my $'. #'    $expression.= ';my $'. #'
     $key.'="'.$Apache::inputtags::params{$key}.'"';      $key.'="'.$Apache::inputtags::params{$key}.'"';
  }   }
    if ($$tagstack[-1] eq 'formularesponse') {
     $expression.=';my $type="fml";';
    } elsif ($$tagstack[-1] eq 'numericalresponse') {
     $expression.=';my $type="float";';
    }
  $expression.="');";   $expression.="');";
  $result = &Apache::run::run($expression,$safeeval);   $result = &Apache::run::run($expression,$safeeval);
  my ($awards) = split /:/ , $result;   my ($awards) = split /:/ , $result;
Line 131  sub end_numericalresponse { Line 141  sub end_numericalresponse {
     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" ) {      if ($award =~ /^correct/ || $status eq "SHOW_ANSWER" ) {
       my $answervar=&Apache::lonxml::get_param('answer',$parstack,$safeeval);        my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,
       my (@answers)=&Apache::run::run("return $answervar",$safeeval,1);     $safeeval);
       if (!defined($answers[0])) { $answers[0]=$answervar; } else {        my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,
  &Apache::lonxml::debug("answers is $#answers :$answers[0]:");     $safeeval);
       }        my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval);
       my $formatvar=&Apache::lonxml::get_param('format',$parstack,$safeeval);  
       my (@formats)=&Apache::run::run("return $formatvar",$safeeval,1);  
       if (!defined($formats[0])) { $formats[0]=$formatvar; }  
   
       my $unit=&Apache::lonxml::get_param('unit',$parstack,$safeeval);        $result="<br />The computer got ";
   
       $result="<br></br>The computer got ";  
   
       for (my $i=0; $i <= $#answers; $i++) {        for (my $i=0; $i <= $#answers; $i++) {
  my $answer=$answers[$i];   my $answer=$answers[$i];
Line 166  sub end_numericalresponse { Line 171  sub end_numericalresponse {
   } elsif ($target eq 'edit') {    } elsif ($target eq 'edit') {
     $result.='</td></tr>'.&Apache::edit::end_table;      $result.='</td></tr>'.&Apache::edit::end_table;
   } elsif ($target eq 'answer') {    } elsif ($target eq 'answer') {
     my $answer= &Apache::run::run('eval \''.$$parstack[-1].';return $answer\'',  
   $safeeval);      my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
     my (@answers) = &Apache::run::run("eval ".$answer,$safeeval);      my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);
     # if the eval fails just use what is in the answer exactly      my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval);
     if (!defined(@answers) || !defined($answers[0])) {      my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval);
       $result.="list zero is undefined<br />";  
       $answers[0]=$answer;      $result.=&Apache::response::answer_header($$tagstack[-1]);
     }      for(my $i=0;$i<=$#answers;$i++) {
     $result.="<br /> An answers: $answer";        my $ans=$answers[$i];
     foreach my $ans (@answers) {        my $fmt;
       $result.="<br /> An answer: $ans";        if (@formats) {
    if ($#formats) {
     $fmt=$formats[$i];
    } else {
     $fmt=$formats[0];
    }
         }
         if ($fmt) { $ans = sprintf('%.'.$fmt,$ans); }
         $result.=&Apache::response::answer_part($$tagstack[-1],$ans);
       }
       if ($unit) {
         $result.=&Apache::response::answer_part($$tagstack[-1],
         '<b>'.$unit.'</b>');
       }
       if ($type || $token->[1] eq 'stringresponse') {
         my $string='Case Insensitive';
         if ($type eq 'mc') {
    $string='Multiple Choice';
         } elsif ($type eq 'cs') {
    $string='Case Sensitive';
         } elsif ($type eq 'ci') {
    $string='Case Insensitive';
         } elsif ($type eq 'fml') {
    $string='Formula';
         }
         $result.=&Apache::response::answer_part($$tagstack[-1],
         '<b>'.$string.'</b>');
       }
       if ($$tagstack[-1] eq 'formularesponse') {
         my $samples=&Apache::lonxml::get_param('samples',$parstack,$safeeval);
         $result.=&Apache::response::answer_part($$tagstack[-1],$samples);
     }      }
     $result .= "<br />".&Apache::run::run('return $result',$safeeval);      $result.=&Apache::response::answer_footer($$tagstack[-1]);
   }    }
   &Apache::response::end_response;    &Apache::response::end_response;
   return $result;    return $result;
Line 199  sub end_stringresponse { Line 234  sub end_stringresponse {
   return end_numericalresponse(@_);    return end_numericalresponse(@_);
 }  }
   
   sub start_formularesponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;
     if ($target eq 'meta') {
       $result=&Apache::response::meta_package_write('formularesponse');
     } else {
       $result.=&start_numericalresponse(@_);
     }
     return $result;
   }
   
   sub end_formularesponse {
     return end_numericalresponse(@_);
   }
   
 1;  1;
 __END__  __END__
     
Removed from v.1.43  
changed lines
  Added in v.1.46

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