--- loncom/homework/caparesponse/caparesponse.pm 2003/04/21 17:51:46 1.94 +++ loncom/homework/caparesponse/caparesponse.pm 2003/11/25 14:37:11 1.124 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # caparesponse definition # -# $Id: caparesponse.pm,v 1.94 2003/04/21 17:51:46 sakharuk Exp $ +# $Id: caparesponse.pm,v 1.124 2003/11/25 14:37:11 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -42,14 +42,12 @@ sub start_numericalresponse { $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); $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). &Apache::loncommon::help_open_topic('Numerical_Response_Format'); - } elsif ($token->[1] eq 'stringresponse') { - $result.=&Apache::edit::select_arg('Type:','type', - [['cs','Case Sensitive'],['ci','Case Insensitive'], - ['mc','Case Insensitive, Any Order']],$token); } elsif ($token->[1] eq 'formularesponse') { $result.=&Apache::edit::text_arg('Sample Points:','samples', $token,40). @@ -61,11 +59,8 @@ sub start_numericalresponse { if ($token->[1] eq 'numericalresponse') { $constructtag=&Apache::edit::get_new_args($token,$parstack, $safeeval,'answer', - 'unit','format'); - } elsif ($token->[1] eq 'stringresponse') { - $constructtag=&Apache::edit::get_new_args($token,$parstack, - $safeeval,'answer', - 'type'); + 'incorrect','unit', + 'format'); } elsif ($token->[1] eq 'formularesponse') { $constructtag=&Apache::edit::get_new_args($token,$parstack, $safeeval,'answer', @@ -79,6 +74,16 @@ sub start_numericalresponse { $result=&Apache::response::meta_package_write('numericalresponse'); } elsif ($target eq 'answer' || $target eq 'grade') { &Apache::response::reset_params(); + } elsif ($target eq 'web') { + my $partid = $Apache::inputtags::part; + my $hideunit=&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffunit'); + &Apache::lonxml::debug("Got unit $hideunit for $partid $id"); + #no way to enter units, with radio buttons + if (lc($hideunit) eq "yes") { + my $unit=&Apache::lonxml::get_param_var('unit',$parstack, + $safeeval); + if ($unit =~ /\S/) { $result.=" (in $unit) "; } + } } return $result; } @@ -90,74 +95,89 @@ sub end_numericalresponse { if (!$Apache::lonxml::default_homework_loaded) { &Apache::lonxml::default_homework_load($safeeval); } - if ( $target eq 'grade' && defined $ENV{'form.submitted'}) { + if ( $target eq 'grade' && 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']; - my $response = &Apache::response::getresponse(); - if ( $response =~ /[^\s]/) { - my $ad; - my %previous = &Apache::response::check_for_previous($response,$partid,$id); - $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response; - &Apache::lonxml::debug("submitted a $response
\n"); - &Apache::lonxml::debug($$parstack[-1] . "\n
"); - - if ($ENV{'form.submitted'} eq 'scantron') { - my $number_of_bubbles = 8;#default values for number of bubbles - my (@formats)=&Apache::lonxml::get_param_var('format', - $parstack,$safeeval); - my (@answers)=&Apache::lonxml::get_param_var('answer', - $parstack,$safeeval); - my @values=&make_numerical_bubbles($number_of_bubbles,$target, - $answers[0],$formats[0]); - $response=$values[$response]; - } else { - $response =~ s/\\/\\\\/g; - $response =~ s/\'/\\\'/g; + if ($Apache::lonhomework::type eq 'exam' && + $$tagstack[-1] eq 'formularesponse') { + $increment=&Apache::response::scored_response($partid,$id); + } else { + my $response = &Apache::response::getresponse(); + if ( $response =~ /[^\s]/) { + my $ad; + my %previous = &Apache::response::check_for_previous($response,$partid,$id); + &Apache::lonxml::debug("submitted a $response
\n"); + &Apache::lonxml::debug($$parstack[-1] . "\n
"); + + if ($ENV{'form.submitted'} eq '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; + } + $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response; + &Apache::lonxml::debug("current $response"); + my $expression="&caparesponse_check_list('".$response."','". + $$parstack[-1]; + my $hideunit=&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffunit'); + + foreach my $key (keys(%Apache::inputtags::params)) { + $expression.= ';my $'. #' + $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 $unit=undef;'; + } + #sig fig don't make much sense either + if (($Apache::lonhomework::type eq 'exam' || + $ENV{'form.submitted'} eq 'scantron') && + $$tagstack[-1] eq 'numericalresponse') { + $expression.=';my $sig=undef;'; + } + + if ($$tagstack[-1] eq 'formularesponse') { + $expression.=';my $type="fml";'; + } elsif ($$tagstack[-1] eq 'numericalresponse') { + $expression.=';my $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; + + $result = &Apache::run::run($expression,$safeeval); + my ($awards) = split /:/ , $result; + ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards); + &Apache::lonxml::debug("$expression"); + &Apache::lonxml::debug("\n
result:$result:$Apache::lonxml::curdepth
\n"); + &Apache::response::handle_previous(\%previous,$ad); + $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad; + $result=''; } - &Apache::lonxml::debug("current $response"); - my $expression="&caparesponse_check_list('".$response."','". - $$parstack[-1]; - #no way to enter units, with radio buttons - if ($Apache::lonhomework::type eq 'exam') { - $expression.=';my $unit=undef;'; - } - 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; - ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards); - &Apache::lonxml::debug("$expression"); - &Apache::lonxml::debug("\n
result:$result:$Apache::lonxml::curdepth
\n"); - &Apache::response::handle_previous(\%previous,$ad); - $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad; - $result=''; } } elsif ($target eq 'web' || $target eq 'tex') { my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack, $safeeval); my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; my $status = $Apache::inputtags::status['-1']; - if ($award =~ /^correct/ || $status eq "SHOW_ANSWER" || $ENV{'form.texaward'} eq 'SHOW_ANSWER') { + 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="
The correct answer is "; - } elsif ($target eq 'tex') { - if ($ENV{'form.texaward'} eq 'SHOW_ANSWER') { - $result='\vskip 0 mm The correct answer is \\texttt{ '; - } } for (my $i=0; $i <= $#answers; $i++) { my $answer=$answers[$i]; @@ -169,15 +189,13 @@ sub end_numericalresponse { } 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 ($ENV{'form.texaward'} eq 'SHOW_ANSWER') { - $result.=$formatted; - } if ($target eq 'tex') { $formatted=''; #$formatted=&Apache::lonxml::latex_special_symbols($formatted); @@ -187,33 +205,36 @@ sub end_numericalresponse { chop $result; if ($target eq 'web') { $result.=" $unit.
"; - } elsif ($target eq 'tex') { - if ($ENV{'form.texaward'} eq 'SHOW_ANSWER') { - $result.=&Apache::lonxml::latex_special_symbols($unit); - $result.="}. \\vskip 0 mm "; - } } } if ($Apache::lonhomework::type eq 'exam') { - my $number_of_bubbles = 8; #default values for number of bubbles + my $partid=$Apache::inputtags::part; + my $id=$Apache::inputtags::response[-1]; + 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 $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]); + $formats[0],\@incorrect); my @alphabet=('A'..'Z'); - my $id=$Apache::inputtags::response[-1]; if ($target eq 'web') { if ($$tagstack[-1] eq 'numericalresponse') { if ($unit=~/\S/) {$result.=' (in '.$unit.')

';} $result.= ''; + 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]) { + $checked=" checked='on' "; + } $result.=''; + '" value="'.$bubble_values[$ind].'" '.$checked + .' />'.$alphabet[$ind].': '. + $bubble_values[$ind].''; } $result.='
'. - $alphabet[$ind].': '. - $bubble_values[$ind].'
'; } elsif ($$tagstack[-1] eq 'formularesponse') { @@ -222,7 +243,7 @@ sub end_numericalresponse {

'; } } elsif ($target eq 'tex') { - if (defined $unit and $Apache::lonhomework::type eq 'exam') { + if ((defined $unit) and ($unit=~/\S/) and ($Apache::lonhomework::type eq 'exam')) { $result.=' \textit{(in} \verb|'.$unit.'|\textit{)} '; } if ($$tagstack[-1] eq 'numericalresponse') { @@ -266,6 +287,8 @@ sub end_numericalresponse { if ($target eq 'analyze') { push (@{ $Apache::lonhomework::analyze{"parts"} },$part_id); $Apache::lonhomework::analyze{"$part_id.type"} = $$tagstack[-1]; + my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval); + push (@{ $Apache::lonhomework::analyze{"$part_id.incorrect"} }, @incorrect); } &Apache::response::setup_params($$tagstack[-1]); my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval); @@ -288,7 +311,8 @@ sub end_numericalresponse { if ($Apache::inputtags::params{'sig'}) { ($sighigh,$siglow)=&get_sigrange($Apache::inputtags::params{'sig'}); } - if ($fmt) { + if ($fmt && $$tagstack[-1] eq 'numericalresponse') { + $fmt=~s/e/E/g; $ans = sprintf('%.'.$fmt,$ans); if ($high) { $high=sprintf('%.'.$fmt,$high); @@ -296,8 +320,14 @@ sub end_numericalresponse { } } if ($target eq 'answer') { - if ($high) { $ans.=' ['.$low.','.$high.']'; } - if ($sighigh) { $ans.= " Sig $siglow - $sighigh"; } + if ($high && $$tagstack[-1] eq 'numericalresponse') { $ans.=' ['.$low.','.$high.']'; } + if ($sighigh && $$tagstack[-1] eq 'numericalresponse') { + if ($ENV{'form.answer_output_mode'} eq 'tex') { + $ans.= " Sig $siglow - $sighigh"; + } else { + $ans.= " Sig $siglow - $sighigh"; + } + } $result.=&Apache::response::answer_part($$tagstack[-1],$ans); } elsif ($target eq 'analyze') { push (@{ $Apache::lonhomework::analyze{"$part_id.answer"} }, $ans); @@ -307,32 +337,18 @@ sub end_numericalresponse { } } } - if ($unit) { - if ($target eq 'answer') { - $result.=&Apache::response::answer_part($$tagstack[-1], - "Unit: $unit"); - } elsif ($target eq 'analyze') { - push (@{ $Apache::lonhomework::analyze{"$part_id.unit"} }, - $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'; - } + if (defined($unit) and ($unit ne '') and + $$tagstack[-1] eq 'numericalresponse') { if ($target eq 'answer') { - $result.=&Apache::response::answer_part($$tagstack[-1], - ''.$string.''); + if ($ENV{'form.answer_output_mode'} eq 'tex') { + $result.=&Apache::response::answer_part($$tagstack[-1], + " Unit: $unit "); + } else { + $result.=&Apache::response::answer_part($$tagstack[-1], + "Unit: $unit"); + } } elsif ($target eq 'analyze') { - push (@{ $Apache::lonhomework::analyze{"$part_id.type"} }, - $type); + push (@{ $Apache::lonhomework::analyze{"$part_id.unit"} }, $unit); } } if ($$tagstack[-1] eq 'formularesponse' && $target eq 'answer') { @@ -343,7 +359,7 @@ sub end_numericalresponse { $result.=&Apache::response::answer_footer($$tagstack[-1]); } } - if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || + if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze') { &Apache::lonxml::increment_counter($increment); } @@ -375,12 +391,13 @@ sub format_number { my ($number,$format,$target)=@_; my $ans; if ($format ne '') { + $format=~s/e/E/g; $ans = sprintf('%.'.$format,$number); } else { my $format = ''; #What is the number? (integer,decimal,floating point) if ($number=~/^(\d*\.?\d*)(E|e)(\d*)$/) { - $format = 'e'.$2; + $format = '3e'; } elsif ($number=~/^(\d*)\.(\d*)$/) { $format = '4f'; } elsif ($number=~/^(\d*)$/) { @@ -393,16 +410,32 @@ sub format_number { my $number = $1; my $power = $2; $power=~s/^\+//; - $power=~s/^(-?)0+(\d+)//; - $ans=$number.'$\times 10^{'.$1.$2.'}$'; #'stupidemacs + $power=~s/^(-?)0+(\d+)/$1$2/; + $ans=$number.'$\times 10^{'.$power.'}$'; #'stupidemacs } } return $ans; } sub make_numerical_bubbles { - my ($number_of_bubbles,$target,$answer,$format) =@_; + my ($number_of_bubbles,$target,$answer,$format,$incorrect) =@_; my @bubble_values = (); + &Apache::lonxml::debug("answer is $answer incorrect is $incorrect"); + my @oldseed=&Math::Random::random_get_seed(); + if (defined($incorrect) && ref($incorrect)) { + &Apache::lonxml::debug("inside ".(scalar(@$incorrect)+1 gt $number_of_bubbles)); + if (scalar(@$incorrect)+1 >= $number_of_bubbles) { + &Apache::lonxml::debug("inside ".(scalar(@$incorrect)+1).":$number_of_bubbles"); + &Apache::response::setrandomnumber(); + my @rand_inc=&Math::Random::random_permutation(@$incorrect); + @bubble_values=@rand_inc[0..($number_of_bubbles-2)]; + @bubble_values=sort {$a <=> $b} (@bubble_values,$answer); + &Apache::lonxml::debug("Answer was :$answer: returning :".$#bubble_values.": whih are :".join(':',@bubble_values)); + &Math::Random::random_set_seed(@oldseed); + return @bubble_values; + } + #FIXME what to do when not enough incorrects specified? + } my @factors = (1.13,1.17,1.25,1.33,1.45); #default values of factors my @powers = (1.0,2.0,3.0,4.0,5.0,6.0,7.0,8.0); #default values for powers &Apache::response::setrandomnumber(); @@ -416,6 +449,7 @@ sub make_numerical_bubbles { $format,$target); } + &Math::Random::random_set_seed(@oldseed); return @bubble_values; } @@ -456,23 +490,178 @@ sub get_sigrange { sub start_stringresponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; 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'); - } else { - $result.=&start_numericalresponse(@_); + &Apache::response::end_response(); + } elsif ($target eq 'edit') { + $result.=&Apache::edit::tag_start($target,$token); + $result.=&Apache::edit::text_arg('Answer:','answer',$token); + $result.=&Apache::edit::select_arg('Type:','type', + [['cs','Case Sensitive'],['ci','Case Insensitive'], + ['mc','Case Insensitive, Any Order'], + ['re','Regular Expression']],$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'); + if ($constructtag) { + $result = &Apache::edit::rebuild_tag($token); + $result.=&Apache::edit::handle_insert(); + } + } elsif ($target eq 'answer' || $target eq 'grade') { + &Apache::response::reset_params(); } return $result; } sub end_stringresponse { - return end_numericalresponse(@_); + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $increment=1; + my $result = ''; + my $part=$Apache::inputtags::part; + my $id=$Apache::inputtags::response[-1]; + my $answer=&Apache::lonxml::get_param('answer',$parstack,$safeeval); + my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval); + &Apache::lonxml::debug("current $answer ".$token->[2]); + if (!$Apache::lonxml::default_homework_loaded) { + &Apache::lonxml::default_homework_load($safeeval); + } + if ( $target eq 'grade' && defined($ENV{'form.submitted'})) { + &Apache::response::setup_params($$tagstack[-1]); + $safeeval->share_from('capa',['&caparesponse_capa_check_answer']); + if ($Apache::lonhomework::type eq 'exam' || + $ENV{'form.submitted'} eq 'scantron') { + $increment=&Apache::response::scored_response($part,$id); + } else { + my $response = &Apache::response::getresponse(); + if ( $response =~ /[^\s]/) { + my %previous = &Apache::response::check_for_previous($response, + $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; + if ($type eq 're' ) { + # if the RE wasn't in a var it likely got munged, + # thus grab it from the var directly +# my $testans=$token->[2]->{'answer'}; +# 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); + &Apache::lonxml::debug("current $response"); + &Apache::lonxml::debug("current $answer"); + $ad = ($result) ? 'APPROX_ANS' : 'INCORRECT'; + } else { + $response =~ s/\\/\\\\/g; + $response =~ s/\'/\\\'/g; + &Apache::lonxml::debug("current $response"); + my $expression="&caparesponse_check_list('".$response."','". + $$parstack[-1]; + foreach my $key (keys(%Apache::inputtags::params)) { + $expression.= ';my $'. #' + $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"); + &Apache::lonxml::debug("\n
result:$result:$Apache::lonxml::curdepth
\n"); + } + &Apache::response::handle_previous(\%previous,$ad); + $Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad; + } + } + } 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="
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(); + $result.='\begin{enumerate}'; + for (my $i=0;$i<$increment;$i++) { + $result.='\item[\textbf{'.($Apache::lonxml::counter+$i). + '}.]\textit{Leave blank on scoring form}\vskip 0 mm'; + } + $result.= '\end{enumerate}'; + } + } elsif ($target eq 'answer' || $target eq 'analyze') { + if ($target eq 'analyze') { + push (@{ $Apache::lonhomework::analyze{"parts"} },"$part.$id"); + $Apache::lonhomework::analyze{"$part.$id.type"} = $$tagstack[-1]; + } + &Apache::response::setup_params($$tagstack[-1]); + if ($target eq 'answer') { + $result.=&Apache::response::answer_header($$tagstack[-1]); + } +# foreach my $ans (@answers) { + if ($target eq 'answer') { + $result.=&Apache::response::answer_part($$tagstack[-1],$answer); + } elsif ($target eq 'analyze') { + push (@{ $Apache::lonhomework::analyze{"$part.$id.answer"} }, + $answer); + } +# } + 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 're') { + $string='Regular Expression'; + } + if ($target eq 'answer') { + if ($ENV{'form.answer_output_mode'} eq 'tex') { + $result.=&Apache::response::answer_part($$tagstack[-1], + "$string"); + } else { + $result.=&Apache::response::answer_part($$tagstack[-1], + "$string"); + } + } elsif ($target eq 'analyze') { + push (@{$Apache::lonhomework::analyze{"$part.$id.str_type"}}, + $type); + } + if ($target eq 'answer') { + $result.=&Apache::response::answer_footer($$tagstack[-1]); + } + } elsif ($target eq 'edit') { + $result.=''.&Apache::edit::end_table; + } + if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || + $target eq 'tex' || $target eq 'analyze') { + &Apache::lonxml::increment_counter($increment); + } + &Apache::response::end_response; + return $result; } sub start_formularesponse { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; if ($target eq 'meta') { + &Apache::response::start_response($parstack,$safeeval); $result=&Apache::response::meta_package_write('formularesponse'); + &Apache::response::end_response(); } else { $result.=&start_numericalresponse(@_); }