--- loncom/homework/caparesponse/caparesponse.pm 2004/10/21 03:24:23 1.157
+++ loncom/homework/caparesponse/caparesponse.pm 2005/02/23 23:41:23 1.165
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# caparesponse definition
#
-# $Id: caparesponse.pm,v 1.157 2004/10/21 03:24:23 albertel Exp $
+# $Id: caparesponse.pm,v 1.165 2005/02/23 23:41:23 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -128,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;
@@ -136,16 +136,6 @@ 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') {
- if ( !defined($ENV{'form.submitted'})) { return ''; }
- 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]/) {
@@ -154,14 +144,15 @@ 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,$safeeval);
- $response=$values[$response];
+ 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;
my $args_ref= \%{$safeeval->varglob('LONCAPA::CAPAresponse_args')};
@@ -184,7 +175,7 @@ sub end_numericalresponse {
}
#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') {
delete($$args_ref{'sig'});
}
@@ -213,6 +204,11 @@ sub end_numericalresponse {
$Apache::inputtags::params{'sig'});
}
&Apache::lonxml::debug("\n
result:$result:$Apache::lonxml::curdepth
\n");
+ if ($Apache::lonhomework::type eq 'survey' &&
+ ($ad eq 'INCORRECT' || $ad eq 'APPROX_ANS' ||
+ $ad eq 'EXACT_ANS')) {
+ $ad='SUBMITTED';
+ }
&Apache::response::handle_previous(\%previous,$ad);
$Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
$Apache::lonhomework::results{"resource.$partid.$id.awardmsg"}=$msg;
@@ -238,9 +234,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,$safeeval);
+ 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') {
@@ -249,13 +247,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') {
@@ -269,7 +267,7 @@ 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.'}.]';
@@ -280,7 +278,7 @@ sub end_numericalresponse {
}
$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];
@@ -309,6 +307,7 @@ 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');
@@ -362,6 +361,9 @@ sub end_numericalresponse {
push (@{ $Apache::lonhomework::analyze{"$part_id.ans_high"} }, $high);
push (@{ $Apache::lonhomework::analyze{"$part_id.ans_low"} }, $low);
}
+ if ($fmt) {
+ push (@{ $Apache::lonhomework::analyze{"$part_id.format"} }, $fmt);
+ }
}
}
if (defined($unit) and ($unit ne '') and
@@ -400,7 +402,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;
@@ -458,7 +460,7 @@ sub format_number {
sub make_numerical_bubbles {
my ($number_of_bubbles,$target,$answer,$format,$incorrect,$safeeval) =@_;
- my @bubble_values = ();
+ my @bubble_values=();
&Apache::lonxml::debug("answer is $answer incorrect is $incorrect");
my @oldseed=&Math::Random::random_get_seed();
if (defined($incorrect) && ref($incorrect)) {
@@ -473,15 +475,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,$safeeval);
+ 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
@@ -491,14 +497,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],
+ $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 {
@@ -603,23 +610,12 @@ 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') {
- if ( !defined($ENV{'form.submitted'})) { return ''; }
- 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]/) {
@@ -662,6 +658,11 @@ sub end_stringresponse {
($ad,$msg) = &Apache::inputtags::finalizeawards(\@awards,\@msgs);
&Apache::lonxml::debug("\n
result:$result:$Apache::lonxml::curdepth
\n");
}
+ if ($Apache::lonhomework::type eq 'survey' &&
+ ($ad eq 'INCORRECT' || $ad eq 'APPROX_ANS' ||
+ $ad eq 'EXACT_ANS')) {
+ $ad='SUBMITTED';
+ }
&Apache::response::handle_previous(\%previous,$ad);
$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad;
$Apache::lonhomework::results{"resource.$part.$id.awardmsg"}=$msg;