[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.44 and 1.57

version 1.44, 2001/10/01 20:18:31 version 1.57, 2002/09/04 06:55:27
Line 1 Line 1
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 # caparesponse definition  # caparesponse definition
   #
   # $Id$
   #
   # Copyright Michigan State University Board of Trustees
   #
   # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
   #
   # LON-CAPA is free software; you can redistribute it and/or modify
   # it under the terms of the GNU General Public License as published by
   # the Free Software Foundation; either version 2 of the License, or
   # (at your option) any later version.
   #
   # LON-CAPA is distributed in the hope that it will be useful,
   # but WITHOUT ANY WARRANTY; without even the implied warranty of
   # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   # GNU General Public License for more details.
   #
   # You should have received a copy of the GNU General Public License
   # along with LON-CAPA; if not, write to the Free Software
   # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   #
   # /home/httpd/html/adm/gpl.txt
   #
   # http://www.lon-capa.org/
   #
   
 package Apache::caparesponse;  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 57  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:','points',$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 79  sub start_numericalresponse { Line 104  sub start_numericalresponse {
  'answer','type');   'answer','type');
     } elsif ($token->[1] eq 'formularesponse') {      } elsif ($token->[1] eq 'formularesponse') {
       $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,        $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval,
  'answer','points');   'answer','samples');
     }      }
     if ($constructtag) {      if ($constructtag) {
       $result = &Apache::edit::rebuild_tag($token);        $result = &Apache::edit::rebuild_tag($token);
Line 96  sub end_numericalresponse { Line 121  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 115  sub end_numericalresponse { Line 140  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;
  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");
  $result='';   $result='';
       }        }
     }      }
   } elsif ($target eq 'web') {    } elsif ($target eq 'web' || $target eq 'tex') {
     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" ) {
Line 142  sub end_numericalresponse { Line 166  sub end_numericalresponse {
    $safeeval);     $safeeval);
       my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval);        my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval);
   
       $result="<br></br>The computer got ";        if ($target eq 'web') {
     $result="<br />The computer got ";
         } elsif ($target eq 'tex') {
     $result='\vskip 0 mm The computer got \\texttt{';
         }
       for (my $i=0; $i <= $#answers; $i++) {        for (my $i=0; $i <= $#answers; $i++) {
  my $answer=$answers[$i];   my $answer=$answers[$i];
  my $format;   my $format;
Line 152  sub end_numericalresponse { Line 179  sub end_numericalresponse {
  } else {   } else {
   $format=$formats[0];    $format=$formats[0];
  }   }
    my $formatted;
  if ((defined($format)) && ($format ne '')) {   if ((defined($format)) && ($format ne '')) {
   &Apache::lonxml::debug("formatting with :$format: answer :$answer:");    &Apache::lonxml::debug("formatting with :$format: answer :$answer:");
   $result.=sprintf('%.'.$format,$answer).',';    $formatted=sprintf('%.'.$format,$answer).',';
  } else {   } else {
   &Apache::lonxml::debug("no format answer :$answer:");    &Apache::lonxml::debug("no format answer :$answer:");
   $result.="$answer,";    $formatted="$answer,";
  }   }
    if ($target eq 'tex') {$formatted=&Apache::lonxml::latex_special_symbols($formatted);}
    $result.=$formatted;
       }        }
       chop $result;        chop $result;
       $result.=" $unit.<br></br>";        if ($target eq 'web') {
    $result.=" $unit.<br />";
         } elsif ($target eq 'tex') {
    $result.=&Apache::lonxml::latex_special_symbols($unit);
    $result.="}. \\vskip 0 mm ";
         }
     }      }
   } 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') {
   
       &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);
     my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval);      my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval);
   
     $result.=&Apache::response::answer_header('numericalresponse');      $result.=&Apache::response::answer_header($$tagstack[-1]);
     for(my $i=0;$i<=$#answers;$i++) {      for(my $i=0;$i<=$#answers;$i++) {
       my $ans=$answers[$i];        my $ans=$answers[$i];
       my $fmt;        my $fmt;
Line 183  sub end_numericalresponse { Line 219  sub end_numericalresponse {
   $fmt=$formats[0];    $fmt=$formats[0];
  }   }
       }        }
       if ($fmt) { $ans = sprintf('%.'.$fmt,$ans); }        my ($high,$low);
       $result.=&Apache::response::answer_part('numericalresponse',$ans);        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);
     }      }
     if ($unit) {      if ($unit) {
       $result.=&Apache::response::answer_part('numericalresponse',        $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 198  sub end_numericalresponse { Line 248  sub end_numericalresponse {
  $string='Case Sensitive';   $string='Case Sensitive';
       } elsif ($type eq 'ci') {        } elsif ($type eq 'ci') {
  $string='Case Insensitive';   $string='Case Insensitive';
         } elsif ($type eq 'fml') {
    $string='Formula';
       }        }
       $result.=&Apache::response::answer_part('numericalresponse',        $result.=&Apache::response::answer_part($$tagstack[-1],
       '<b>'.$string.'</b>');        '<b>'.$string.'</b>');
     }      }
     $result.=&Apache::response::answer_footer('numericalresponse');      if ($$tagstack[-1] eq 'formularesponse') {
         my $samples=&Apache::lonxml::get_param('samples',$parstack,$safeeval);
         $result.=&Apache::response::answer_part($$tagstack[-1],$samples);
       }
       $result.=&Apache::response::answer_footer($$tagstack[-1]);
   }    }
   &Apache::response::end_response;    &Apache::response::end_response;
   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.44  
changed lines
  Added in v.1.57

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