--- loncom/homework/caparesponse/caparesponse.pm	2004/10/05 20:18:29	1.153
+++ loncom/homework/caparesponse/caparesponse.pm	2005/01/26 22:43:43	1.161
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.153 2004/10/05 20:18:29 albertel Exp $
+# $Id: caparesponse.pm,v 1.161 2005/01/26 22:43:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -62,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,
@@ -103,6 +103,8 @@ sub start_numericalresponse {
 		} 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.',';
@@ -134,6 +136,16 @@ 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]/) {
@@ -148,8 +160,9 @@ sub end_numericalresponse {
 		    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')};
@@ -226,9 +239,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') {
@@ -237,13 +252,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.='<td><input type="radio" name="HWVAL_'.$id.
-			    '" value="'.$bubble_values[$ind].'" '.$checked
+			    '" value="'.$bubble_values->[$ind].'" '.$checked
 			    .' /><b>'.$alphabet[$ind].'</b>: '.
-			    $bubble_values[$ind].'</td>';
+			    $bubble_display->[$ind].'</td>';
 		    }
 		    $result.='</tr></table>';
 		} elsif ($tag eq 'formularesponse') {
@@ -257,7 +272,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.'}.]';
@@ -268,7 +283,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];
@@ -297,7 +312,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);
@@ -324,11 +342,13 @@ sub end_numericalresponse {
 	    }
 	    if ($fmt && $tag eq 'numericalresponse') {
 		$fmt=~s/e/E/g;
+		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 ($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.']'; }
@@ -384,7 +404,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;
@@ -433,13 +453,16 @@ sub format_number {
 	    $format = 'd';
 	}
     }
+    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,$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)) {
@@ -454,15 +477,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
@@ -472,14 +499,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 {
@@ -590,6 +618,17 @@ sub end_stringresponse {
 	if ($Apache::lonhomework::type eq 'exam' ||
 	    $ENV{'form.submitted'} eq '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]/) {
@@ -654,6 +693,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') {