--- loncom/homework/caparesponse/caparesponse.pm 2004/03/12 21:06:19 1.141 +++ loncom/homework/caparesponse/caparesponse.pm 2005/01/31 22:00:40 1.162 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # caparesponse definition # -# $Id: caparesponse.pm,v 1.141 2004/03/12 21:06:19 albertel Exp $ +# $Id: caparesponse.pm,v 1.162 2005/01/31 22:00:40 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -39,12 +39,14 @@ sub start_numericalresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $id = &Apache::response::start_response($parstack,$safeeval); my $result; + undef %{$safeeval->varglob('LONCAPA::CAPAresponse_args')}; if ($target eq 'edit') { $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('Incorrect Answers:','incorrect', - $token); + $token). + &Apache::loncommon::help_open_topic('numerical_wrong_answers'); $result.=&Apache::edit::text_arg('Unit:','unit',$token,5). &Apache::loncommon::help_open_topic('Physical_Units'); $result.=&Apache::edit::text_arg('Format:','format',$token,4). @@ -60,7 +62,7 @@ sub start_numericalresponse { if ($token->[1] eq 'numericalresponse') { $constructtag=&Apache::edit::get_new_args($token,$parstack, $safeeval,'answer', - 'incorrect','unit', + 'incorrect','unit', 'format'); } elsif ($token->[1] eq 'formularesponse') { $constructtag=&Apache::edit::get_new_args($token,$parstack, @@ -85,6 +87,34 @@ sub start_numericalresponse { $safeeval); if ($unit =~ /\S/) { $result.=" (in $unit) "; } } + if ( &Apache::response::show_answer() ) { + my $answertxt; + 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); + for (my $i=0; $i <= $#answers; $i++) { + my $answer=$answers[$i]; + my $format; + if ($#formats > 0) { + $format=$formats[$i]; + } else { + $format=$formats[0]; + } + if ($unit=~/\$/) { $format="\$".$format; $unit=~s/\$//g; } + if ($unit=~/\,/) { $format="\,".$format; $unit=~s/\,//g; } + my $formatted=&format_number($answer,$format,$target, + $safeeval); + $answertxt.=$formatted.','; + } + chop $answertxt; + if ($target eq 'web') { + $answertxt.=" $unit "; + } + $Apache::inputtags::answertxt{$id}=$answertxt; + } } return $result; } @@ -98,7 +128,7 @@ sub end_numericalresponse { } my $tag; if (scalar(@$tagstack)) { $tag=$$tagstack[-1]; } - if ( $target eq 'grade' && defined($ENV{'form.submitted'})) { + if ( $target eq 'grade' && &Apache::response::submitted() ) { &Apache::response::setup_params($tag,$safeeval); $safeeval->share_from('capa',['&caparesponse_capa_check_answer']); my $partid = $Apache::inputtags::part; @@ -106,6 +136,15 @@ sub end_numericalresponse { if ($Apache::lonhomework::type eq 'exam' && $tag eq 'formularesponse') { $increment=&Apache::response::scored_response($partid,$id); + } elsif ($Apache::lonhomework::type eq 'survey') { + my $response = &Apache::response::getresponse(); + if ( $response =~ /[^\s]/) { + my %previous=&Apache::response::check_for_previous($response, + $partid,$id); + $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response; + my $ad=$Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}='SUBMITTED'; + &Apache::response::handle_previous(\%previous,$ad); + } } else { my $response = &Apache::response::getresponse(); if ( $response =~ /[^\s]/) { @@ -114,59 +153,69 @@ sub end_numericalresponse { &Apache::lonxml::debug("submitted a $response
\n"); &Apache::lonxml::debug($$parstack[-1] . "\n
"); - if ($ENV{'form.submitted'} eq 'scantron') { + if ( &Apache::response::submitted('scantron')) { my $number_of_bubbles = &Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.numbubbles'); if (!$number_of_bubbles) { $number_of_bubbles=8; } my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval); my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval); my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval); - my @values=&make_numerical_bubbles($number_of_bubbles,$target,$answers[0],$formats[0],\@incorrect); - $response=$values[$response]; - } else { - $response =~ s/\\/\\\\/g; - $response =~ s/\'/\\\'/g; + if ($#incorrect eq 0) { @incorrect=(split(/,/,$incorrect[0])); } + my ($values,$display)=&make_numerical_bubbles($number_of_bubbles,$target,$answers[0],$formats[0],\@incorrect,$safeeval); + $response=$values->[$response]; } $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response; - &Apache::lonxml::debug("current $response"); - my $expression="&caparesponse_check_list('".$response."','". - $$parstack[-1]; + my $args_ref= \%{$safeeval->varglob('LONCAPA::CAPAresponse_args')}; + $$args_ref{'response'}=$response; my $hideunit=&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffunit'); + foreach my $arg ('type','tol','sig','format','unit','calc', + 'samples') { + $$args_ref{$arg}= + &Apache::lonxml::get_param($arg,$parstack,$safeeval); + } foreach my $key (keys(%Apache::inputtags::params)) { - $expression.= ';my $__LC__'. #' - $key.'="'.$Apache::inputtags::params{$key}.'"'; + $$args_ref{$key}=$Apache::inputtags::params{$key}; } #no way to enter units, with radio buttons if ($Apache::lonhomework::type eq 'exam' || lc($hideunit) eq "yes") { - $expression.=';my $__LC__unit=undef;'; + delete($$args_ref{'unit'}); } #sig fig don't make much sense either if (($Apache::lonhomework::type eq 'exam' || - $ENV{'form.submitted'} eq 'scantron') && + &Apache::response::submitted('scantron')) && $tag eq 'numericalresponse') { - $expression.=';my $__LC__sig=undef;'; + delete($$args_ref{'sig'}); } if ($tag eq 'formularesponse') { - $expression.=';my $__LC__type="fml";'; + $$args_ref{'type'}='fml'; } elsif ($tag eq 'numericalresponse') { - $expression.=';my $__LC__type="float";'; + $$args_ref{'type'}='float'; } - $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; + @{$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=@answer; - ($result,my @msgs) = &Apache::run::run($expression,$safeeval); + ($result,my @msgs) = + &Apache::run::run("&caparesponse_check_list()",$safeeval); &Apache::lonxml::debug('msgs are'.join(':',@msgs)); - my ($awards) = split /:/ , $result; - ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards); - &Apache::lonxml::debug("$expression"); + my ($awards)=split(/:/,$result); + my (@awards) = split(/,/,$awards); + ($ad,my $msg) = &Apache::inputtags::finalizeawards(\@awards,\@msgs); + &Apache::lonxml::debug('ad is'.$ad); + if ($ad eq 'SIG_FAIL') { + my ($sig_u,$sig_l)= + &get_sigrange($Apache::inputtags::params{'sig'}); + $msg=join(':',$msg,$sig_l,$sig_u); + &Apache::lonxml::debug("sigs bad $sig_u $sig_l ". + $Apache::inputtags::params{'sig'}); + } &Apache::lonxml::debug("\n
result:$result:$Apache::lonxml::curdepth
\n"); &Apache::response::handle_previous(\%previous,$ad); $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad; + $Apache::lonhomework::results{"resource.$partid.$id.awardmsg"}=$msg; $result=''; } } @@ -175,42 +224,6 @@ sub end_numericalresponse { $safeeval); my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; my $status = $Apache::inputtags::status['-1']; - if ( &Apache::response::show_answer() ) { - my (@formats)=&Apache::lonxml::get_param_var('format',$parstack, - $safeeval); - my $unit=&Apache::lonxml::get_param_var('unit',$parstack, - $safeeval); - if ($target eq 'web') { - $result="
".&mt('The correct answer is')." "; - } - for (my $i=0; $i <= $#answers; $i++) { - my $answer=$answers[$i]; - my $format; - if ($#formats > 0) { - $format=$formats[$i]; - } else { - $format=$formats[0]; - } - my $formatted; - if ((defined($format)) && ($format ne '')) { - $format=~s/e/E/g; - &Apache::lonxml::debug("formatting with :$format: answer :$answer:"); - $formatted=sprintf('%.'.$format,$answer).','; - } else { - &Apache::lonxml::debug("no format answer :$answer:"); - $formatted="$answer,"; - } - if ($target eq 'tex') { - $formatted=''; - #$formatted=&Apache::lonxml::latex_special_symbols($formatted); - } - $result.=$formatted; - } - chop $result; - if ($target eq 'web') { - $result.=" $unit.
"; - } - } if ($Apache::lonhomework::type eq 'exam') { my $partid=$Apache::inputtags::part; my $id=$Apache::inputtags::response[-1]; @@ -225,9 +238,11 @@ sub end_numericalresponse { my $unit=&Apache::lonxml::get_param_var('unit',$parstack, $safeeval); my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval); - my @bubble_values=&make_numerical_bubbles($number_of_bubbles, - $target,$answers[0], - $formats[0],\@incorrect); + if ($#incorrect eq 0) { @incorrect=(split(/,/,$incorrect[0])); } + my ($bubble_values,$bubble_display)= + &make_numerical_bubbles($number_of_bubbles, + $target,$answers[0], + $formats[0],\@incorrect,$safeeval); my @alphabet=('A'..'Z'); if ($target eq 'web') { if ($tag eq 'numericalresponse') { @@ -236,13 +251,13 @@ sub end_numericalresponse { my $previous=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.$id.submission"}; for (my $ind=0;$ind<$number_of_bubbles;$ind++) { my $checked=''; - if ($previous eq $bubble_values[$ind]) { + if ($previous eq $bubble_values->[$ind]) { $checked=" checked='on' "; } $result.=''.$alphabet[$ind].': '. - $bubble_values[$ind].''; + $bubble_display->[$ind].''; } $result.=''; } elsif ($tag eq 'formularesponse') { @@ -256,18 +271,18 @@ sub end_numericalresponse { } if ($tag eq 'numericalresponse') { my ($celllength,$number_of_tables,@table_range)= - &get_table_sizes($number_of_bubbles,\@bubble_values); + &get_table_sizes($number_of_bubbles,$bubble_display); my $j=0; my $cou=0; $result.='\vskip -1 mm \noindent \begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]'; for (my $i=0;$i<$number_of_tables;$i++) { - $result.='\vskip -1 mm \noindent \begin{tabular}{'; + $result.='\vskip -1 mm \noindent \setlength{\tabcolsep}{2 mm}\begin{tabular}{'; for (my $ind=0;$ind<$table_range[$j];$ind++) { $result.='p{3 mm}p{'.$celllength.' mm}'; } $result.='}'; for (my $ind=$cou;$ind<$cou+$table_range[$j];$ind++) { - $result.='\hskip -4 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$ & \hskip -3 mm {\small '.$bubble_values[$ind].'} '; + $result.='\hskip -4 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$ & \hskip -3 mm {\small '.$bubble_display->[$ind].'} '; if ($ind != $cou+$table_range[$j]-1) {$result.=' & ';} } $cou += $table_range[$j]; @@ -296,7 +311,10 @@ sub end_numericalresponse { push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id); $Apache::lonhomework::analyze{"$part_id.type"} = $tag; my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval); + if ($#incorrect eq 0) { @incorrect=(split(/,/,$incorrect[0])); } push (@{ $Apache::lonhomework::analyze{"$part_id.incorrect"} }, @incorrect); + &Apache::response::check_if_computed($token,$parstack, + $safeeval,'answer'); } if (scalar(@$tagstack)) { &Apache::response::setup_params($tag,$safeeval); @@ -323,15 +341,17 @@ sub end_numericalresponse { } if ($fmt && $tag eq 'numericalresponse') { $fmt=~s/e/E/g; - $ans = sprintf('%.'.$fmt,$ans); - if ($high) { - $high=sprintf('%.'.$fmt,$high); - $low =sprintf('%.'.$fmt,$low); - } + if ($unit=~/\$/) { $fmt="\$".$fmt; $unit=~s/\$//g; } + if ($unit=~/\,/) { $fmt="\,".$fmt; $unit=~s/\,//g; } + $ans = &format_number($ans,$fmt,$target,$safeeval); + #if ($high) { + # $high=&format_number($high,$fmt,$target,$safeeval); + # $low =&format_number($low,$fmt,$target,$safeeval); + #} } if ($target eq 'answer') { if ($high && $tag eq 'numericalresponse') { $ans.=' ['.$low.','.$high.']'; } - if ($sighigh && $tag eq 'numericalresponse') { + if (defined($sighigh) && $tag eq 'numericalresponse') { if ($ENV{'form.answer_output_mode'} eq 'tex') { $ans.= " Sig $siglow - $sighigh"; } else { @@ -383,7 +403,7 @@ sub get_table_sizes { my $cell_width=0; foreach my $member (@$rbubble_values) { my $cell_width_real=0; - if ($member=~/(\+|-)?(\d*)\.?(\d*)\s*\$\\times\s*10\^{(\+|-)?(\d+)}\$/) { + if ($member=~/(\+|-)?(\d*)\.?(\d*)\s*\$?\\times\s*10\^{(\+|-)?(\d+)}\$?/) { $cell_width_real=(length($2)+length($3)+length($5)+7)*$scale; } elsif ($member=~/(\d*)\.?(\d*)(E|e)(\+|-)?(\d*)/) { $cell_width_real=(length($1)+length($2)+length($5)+9)*$scale; @@ -404,7 +424,9 @@ sub get_table_sizes { $textwidth=$1.'.'.$2; } my $bubbles_per_line=int($textwidth/$cell_width); - if (($bubbles_per_line > $number_of_bubbles/2) && ($number_of_bubbles % 2==0)) {$bubbles_per_line=$number_of_bubbles/2;} + if ($bubbles_per_line > $number_of_bubbles) { + $bubbles_per_line=$number_of_bubbles; + }elsif (($bubbles_per_line > $number_of_bubbles/2) && ($number_of_bubbles % 2==0)) {$bubbles_per_line=$number_of_bubbles/2;} my $number_of_tables = int($number_of_bubbles/$bubbles_per_line); my @table_range = (); for (my $i=0;$i<$number_of_tables;$i++) {push @table_range,$bubbles_per_line;} @@ -418,13 +440,9 @@ sub get_table_sizes { } sub format_number { - my ($number,$format,$target)=@_; + my ($number,$format,$target,$safeeval)=@_; my $ans; - if ($format ne '') { - $format=~s/e/E/g; - $ans = sprintf('%.'.$format,$number); - } else { - my $format = ''; + if ($format eq '') { #What is the number? (integer,decimal,floating point) if ($number=~/^(\d*\.?\d*)(E|e)(\d*)$/) { $format = '3e'; @@ -433,23 +451,17 @@ sub format_number { } elsif ($number=~/^(\d*)$/) { $format = 'd'; } - $ans = sprintf('%.'.$format,$number); } - if ($target eq 'tex') { - if ($ans =~ m/([0-9\.\-\+]+)E([0-9\-\+]+)/ ) { - my $number = $1; - my $power = $2; - $power=~s/^\+//; - $power=~s/^(-?)0+(\d+)/$1$2/; - $ans=$number.'$\times 10^{'.$power.'}$'; #'stupidemacs - } + if (!$Apache::lonxml::default_homework_loaded) { + &Apache::lonxml::default_homework_load($safeeval); } + $ans=&Apache::run::run("&prettyprint(q\0$number\0,q\0$format\0,q\0$target\0)",$safeeval); return $ans; } sub make_numerical_bubbles { - my ($number_of_bubbles,$target,$answer,$format,$incorrect) =@_; - my @bubble_values = (); + my ($number_of_bubbles,$target,$answer,$format,$incorrect,$safeeval) =@_; + my @bubble_values=(); &Apache::lonxml::debug("answer is $answer incorrect is $incorrect"); my @oldseed=&Math::Random::random_get_seed(); if (defined($incorrect) && ref($incorrect)) { @@ -464,15 +476,19 @@ sub make_numerical_bubbles { &Apache::lonxml::debug("Answer was :$answer: returning :".$#bubble_values.": whih are :".join(':',@bubble_values)); &Math::Random::random_set_seed(@oldseed); if (defined($format) && $format ne '') { + my @bubble_display; foreach my $value (@bubble_values) { - $value=&format_number($value,$format,$target); + push(@bubble_display, + &format_number($value,$format,$target,$safeeval)); } + return (\@bubble_values,\@bubble_display); + } else { + return (\@bubble_values,\@bubble_values); } - return @bubble_values; } if (defined($$incorrect[0]) && scalar(@$incorrect)+1 < $number_of_bubbles) { - &Apache::lonxml::warning("Not enough incorrect answers were specified in the incorrect array, ignoring the specified incorrect answers and instead generating them."); + &Apache::lonxml::warning("Not enough incorrect answers were specified in the incorrect array, ignoring the specified incorrect answers and instead generating them (".join(',',@$incorrect).")."); } } my @factors = (1.13,1.17,1.25,1.33,1.45); #default values of factors @@ -482,14 +498,15 @@ sub make_numerical_bubbles { my $power = $powers[$ind]; $ind=&Math::Random::random_uniform_integer(1,0,$#factors); my $factor = $factors[$ind]; + my @bubble_display; for ($ind=0;$ind<$number_of_bubbles;$ind++) { $bubble_values[$ind] = $answer*($factor**($power-$powers[$#powers-$ind])); - $bubble_values[$ind] = &format_number($bubble_values[$ind], - $format,$target); + $bubble_display[$ind] = &format_number($bubble_values[$ind], + $format,$target,$safeeval); } &Math::Random::random_set_seed(@oldseed); - return @bubble_values; + return (\@bubble_values,\@bubble_display); } sub get_tolrange { @@ -510,6 +527,10 @@ sub get_tolrange { sub get_sigrange { my ($sig)=@_; &Apache::lonxml::debug("Got a sig of :$sig:"); + my $courseid=$ENV{'request.course.id'}; + if (lc($ENV{"course.$courseid.disablesigfigs"}) eq 'yes') { + return (15,0); + } my $sig_lbound; my $sig_ubound; if ($sig eq '') { @@ -517,11 +538,11 @@ sub get_sigrange { $sig_ubound =15; #SIG_UB_DEFAULT } else { ($sig_lbound,$sig_ubound) = split(/,/,$sig); - if (!$sig_lbound) { + if (!defined($sig_lbound)) { $sig_lbound = 0; #SIG_LB_DEFAULT $sig_ubound =15; #SIG_UB_DEFAULT } - if (!$sig_ubound) { $sig_ubound=$sig_lbound; } + if (!defined($sig_ubound)) { $sig_ubound=$sig_lbound; } } if (($sig_ubound<$sig_lbound) || ($sig_lbound > 15) || @@ -541,9 +562,7 @@ sub start_stringresponse { my $result; my $id = &Apache::response::start_response($parstack,$safeeval); if ($target eq 'meta') { - &Apache::response::start_response($parstack,$safeeval); $result=&Apache::response::meta_package_write('stringresponse'); - &Apache::response::end_response(); } elsif ($target eq 'edit') { $result.=&Apache::edit::tag_start($target,$token); $result.=&Apache::edit::text_arg('Answer:','answer',$token); @@ -551,18 +570,28 @@ sub start_stringresponse { [['cs','Case Sensitive'],['ci','Case Insensitive'], ['mc','Case Insensitive, Any Order'], ['re','Regular Expression']],$token); - $result.=&Apache::edit::checked_arg('Answer Display:','answerdisplay', - [['inline','Inline']],$token); + $result.=&Apache::edit::text_arg('String to display for answer:', + 'answerdisplay',$token); $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); } elsif ($target eq 'modified') { - my $constructtag; - $constructtag=&Apache::edit::get_new_args($token,$parstack, - $safeeval,'answer', - 'type','answerdisplay'); - if ($constructtag) { - $result = &Apache::edit::rebuild_tag($token); - $result.=&Apache::edit::handle_insert(); - } + my $constructtag; + $constructtag=&Apache::edit::get_new_args($token,$parstack, + $safeeval,'answer', + 'type','answerdisplay'); + if ($constructtag) { + $result = &Apache::edit::rebuild_tag($token); + $result.=&Apache::edit::handle_insert(); + } + } elsif ($target eq 'web') { + if ( &Apache::response::show_answer() ) { + my $answer= + &Apache::lonxml::get_param('answerdisplay',$parstack,$safeeval); + if (!defined $answer || $answer eq '') { + $answer= + &Apache::lonxml::get_param('answer',$parstack,$safeeval); + } + $Apache::inputtags::answertxt{$id}=$answer; + } } elsif ($target eq 'answer' || $target eq 'grade') { &Apache::response::reset_params(); } @@ -582,12 +611,22 @@ sub end_stringresponse { if (!$Apache::lonxml::default_homework_loaded) { &Apache::lonxml::default_homework_load($safeeval); } - if ( $target eq 'grade' && defined($ENV{'form.submitted'})) { + if ( $target eq 'grade' && &Apache::response::submitted() ) { &Apache::response::setup_params('stringresponse',$safeeval); $safeeval->share_from('capa',['&caparesponse_capa_check_answer']); if ($Apache::lonhomework::type eq 'exam' || - $ENV{'form.submitted'} eq 'scantron') { + &Apache::response::submitted('scantron')) { $increment=&Apache::response::scored_response($part,$id); + } elsif ($Apache::lonhomework::type eq 'survey') { + my $response = &Apache::response::getresponse(); + if ( $response =~ /[^\s]/) { + my %previous=&Apache::response::check_for_previous($response, + $part,$id); + $Apache::lonhomework::results{"resource.$part.$id.submission"}= + $response; + my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED'; + &Apache::response::handle_previous(\%previous,$ad); + } } else { my $response = &Apache::response::getresponse(); if ( $response =~ /[^\s]/) { @@ -595,10 +634,9 @@ sub end_stringresponse { $part,$id); &Apache::lonxml::debug("submitted a $response
\n"); &Apache::lonxml::debug($$parstack[-1] . "\n
"); - $Apache::lonhomework::results{"resource.$part.$id.submission"}= $response; - my $ad; + my ($ad,$msg); if ($type eq 're' ) { # if the RE wasn't in a var it likely got munged, # thus grab it from the var directly @@ -606,45 +644,39 @@ sub end_stringresponse { # if ($testans !~ m/^\s*\$/) { # $answer=$token->[2]->{'answer'}; # } - ${$safeeval->varglob('LONCAPA_INTERNAL_response')}= - $response; - $result = &Apache::run::run('return $LONCAPA_INTERNAL_response=~m'.$answer,$safeeval); + ${$safeeval->varglob('LONCAPA::response')}=$response; + $result = &Apache::run::run('return $LONCAPA::response=~m'.$answer,$safeeval); &Apache::lonxml::debug("current $response"); &Apache::lonxml::debug("current $answer"); $ad = ($result) ? 'APPROX_ANS' : 'INCORRECT'; } else { - $response =~ s/\\/\\\\/g; - $response =~ s/\'/\\\'/g; + my $args_ref= + \%{$safeeval->varglob('LONCAPA::CAPAresponse_args')}; + + $$args_ref{'response'}=$response; &Apache::lonxml::debug("current $response"); - my $expression="&caparesponse_check_list('".$response."','". - $$parstack[-1]; + $$args_ref{'type'}= + &Apache::lonxml::get_param('type',$parstack,$safeeval); foreach my $key (keys(%Apache::inputtags::params)) { - $expression.= ';my $'. #' - $key.'="'.$Apache::inputtags::params{$key}.'"'; + $$args_ref{$key}=$Apache::inputtags::params{$key}; } - $expression.="');"; &Apache::lonxml::debug('answer is'.join(':',$answer)); - @{$safeeval->varglob('CAPARESPONSE_CHECK_LIST_answer')}=($answer); - $result = &Apache::run::run($expression,$safeeval); - my ($awards) = split /:/ , $result; - ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards); - &Apache::lonxml::debug("$expression"); + @{$safeeval->varglob('LONCAPA::CAPAresponse_answer')}=($answer); + ($result, my @msgs)=&Apache::run::run("&caparesponse_check_list()",$safeeval); + &Apache::lonxml::debug('msgs are'.join(':',@msgs)); + my ($awards)=split(/:/,$result); + my (@awards) = split(/,/,$awards); + ($ad,$msg) = &Apache::inputtags::finalizeawards(\@awards,\@msgs); &Apache::lonxml::debug("\n
result:$result:$Apache::lonxml::curdepth
\n"); } &Apache::response::handle_previous(\%previous,$ad); $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad; + $Apache::lonhomework::results{"resource.$part.$id.awardmsg"}=$msg; } } } elsif ($target eq 'web' || $target eq 'tex') { my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; my $status = $Apache::inputtags::status['-1']; - if ( &Apache::response::show_answer() ) { - if ($target eq 'web') { - $result=($answerdisplay eq 'inline'?'':"
".&mt('The correct answer is')." ") - .$answer; -# join(', ',@answers).".
"; - } - } if ($Apache::lonhomework::type eq 'exam' && $target eq 'tex') { $result.='\fbox{\fbox{\parbox{\textwidth-5mm}{\strut\\\\\strut\\\\\strut\\\\\strut\\\\}}}'; $increment = &Apache::response::repetition(); @@ -659,6 +691,8 @@ sub end_stringresponse { if ($target eq 'analyze') { push (@{ $Apache::lonhomework::analyze{"parts"} },"$part.$id"); $Apache::lonhomework::analyze{"$part.$id.type"} = 'stringresponse'; + &Apache::response::check_if_computed($token,$parstack,$safeeval, + 'answer'); } &Apache::response::setup_params('stringresponse',$safeeval); if ($target eq 'answer') {