--- loncom/homework/caparesponse/caparesponse.pm 2001/08/06 20:31:37 1.40 +++ loncom/homework/caparesponse/caparesponse.pm 2002/02/12 07:23:31 1.51 @@ -1,12 +1,37 @@ # The LearningOnline Network with CAPA # caparesponse definition +# +# $Id: caparesponse.pm,v 1.51 2002/02/12 07:23:31 albertel Exp $ +# +# 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; use strict; use capa; -sub BEGIN { - &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse','stringresponse')); +BEGIN { + &Apache::lonxml::register('Apache::caparesponse',('caparesponse','numericalresponse','stringresponse','formularesponse')); } sub start_caparesponse { @@ -57,24 +82,29 @@ sub start_numericalresponse { my $id = &Apache::response::start_response($parstack,$safeeval); my $result; 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); if ($token->[1] eq 'numericalresponse') { $result.=&Apache::edit::text_arg('Unit:','unit',$token,5); $result.=&Apache::edit::text_arg('Format:','format',$token,4); - } else { + } elsif ($token->[1] eq 'stringresponse') { $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.=''; + $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); } elsif ($target eq 'modified') { my $constructtag; if ($token->[1] eq 'numericalresponse') { $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval, 'answer','unit','format'); - } else { + } elsif ($token->[1] eq 'stringresponse') { $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval, 'answer','type'); + } elsif ($token->[1] eq 'formularesponse') { + $constructtag=&Apache::edit::get_new_args($token,$parstack,$safeeval, + 'answer','samples'); } if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); @@ -91,6 +121,7 @@ sub end_numericalresponse { my $result = ''; if ( $target eq 'grade' ) { if ( defined $ENV{'form.submitted'}) { + &Apache::response::setup_params($$tagstack[-1]); $safeeval->share_from('capa',['&caparesponse_capa_check_answer']); my $partid = $Apache::inputtags::part; my $id = $Apache::inputtags::response['-1']; @@ -104,20 +135,21 @@ sub end_numericalresponse { $response =~ s/\'/\\\'/g; &Apache::lonxml::debug("current $response"); my $expression="&caparesponse_check_list('".$response."','". - $$parstack[$#$parstack]. - ';my $tol="'.$Apache::inputtags::params{'tol'}.'"'. - ';my $sig="'.$Apache::inputtags::params{'sig'}.'"'. - "');"; + $$parstack[$#$parstack]; + foreach my $key (keys(%Apache::inputtags::params)) { + $expression.= ';my $'. #' + $key.'="'.$Apache::inputtags::params{$key}.'"'; + } + if ($$tagstack[-1] eq 'formularesponse') { + $expression.=';my $type="fml";'; + } elsif ($$tagstack[-1] eq 'numericalresponse') { + $expression.=';my $type="float";'; + } + $expression.="');"; $result = &Apache::run::run($expression,$safeeval); my ($awards) = split /:/ , $result; my ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards); - if ( $previous{'used'} && ($previous{'award'} eq $ad) ) { - if ($previous{'last'}) { - push(@Apache::inputtags::previous,'PREVIOUSLY_LAST'); - } else { - push(@Apache::inputtags::previous,'PREVIOUSLY_USED'); - } - } + &Apache::response::handle_previous(\%previous,$ad); $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad; &Apache::lonxml::debug("$expression"); &Apache::lonxml::debug("\n
result:$result:$Apache::lonxml::curdepth
\n"); @@ -128,18 +160,13 @@ sub end_numericalresponse { my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; my $status = $Apache::inputtags::status['-1']; if ($award =~ /^correct/ || $status eq "SHOW_ANSWER" ) { - my $answervar=&Apache::lonxml::get_param('answer',$parstack,$safeeval); - my (@answers)=&Apache::run::run("return $answervar",$safeeval,1); - if (!defined($answers[0])) { $answers[0]=$answervar; } else { - &Apache::lonxml::debug("answers is $#answers :$answers[0]:"); - } - 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 (@answers)=&Apache::lonxml::get_param_var('answer',$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('unit',$parstack,$safeeval); - - $result="

The computer got "; + $result="
The computer got "; for (my $i=0; $i <= $#answers; $i++) { my $answer=$answers[$i]; @@ -162,19 +189,110 @@ sub end_numericalresponse { } } elsif ($target eq 'edit') { $result.=''.&Apache::edit::end_table; + } elsif ($target eq 'answer') { + + &Apache::response::setup_params($$tagstack[-1]); + my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval); + my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval); + my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval); + my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval); + + $result.=&Apache::response::answer_header($$tagstack[-1]); + for(my $i=0;$i<=$#answers;$i++) { + my $ans=$answers[$i]; + my $fmt; + if (@formats) { + if ($#formats) { + $fmt=$formats[$i]; + } else { + $fmt=$formats[0]; + } + } + my ($high,$low); + if ($Apache::inputtags::params{'tol'}) { + ($high,$low)=&get_tolrange($ans,$Apache::inputtags::params{'tol'}); + } + if ($fmt) { + $ans = sprintf('%.'.$fmt,$ans); + if ($high) { + $high = sprintf('%.'.$fmt,$high); $low = sprintf('%.'.$fmt,$low); + } + } + if ($high) { $ans.=' ['.$low.','.$high.'] '; } + $result.=&Apache::response::answer_part($$tagstack[-1],$ans); + } + if ($unit) { + $result.=&Apache::response::answer_part($$tagstack[-1],"$unit"); + } + 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], + ''.$string.''); + } + 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; 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 start_stringresponse { - return start_numericalresponse(@_); + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result; + if ($target eq 'meta') { + $result=&Apache::response::meta_package_write('stringresponse'); + } else { + $result.=&start_numericalresponse(@_); + } + return $result; } sub end_stringresponse { 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; __END__