--- loncom/homework/caparesponse/caparesponse.pm	2004/06/15 18:34:44	1.149
+++ loncom/homework/caparesponse/caparesponse.pm	2004/10/21 03:24:23	1.157
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.149 2004/06/15 18:34:44 www Exp $
+# $Id: caparesponse.pm,v 1.157 2004/10/21 03:24:23 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,16 +103,11 @@ sub start_numericalresponse {
 		} 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,";
-		}
-		$answertxt.=$formatted;
+		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') {
@@ -141,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]/) {
@@ -155,7 +160,7 @@ 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);
+		    my @values=&make_numerical_bubbles($number_of_bubbles,$target,$answers[0],$formats[0],\@incorrect,$safeeval);
 		    $response=$values[$response];
 		}
 		$Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
@@ -163,7 +168,7 @@ sub end_numericalresponse {
 		$$args_ref{'response'}=$response;
 		my $hideunit=&Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.turnoffunit');
 
-		foreach my $arg ('type','tol','sig','ans_fmt','unit','calc',
+		foreach my $arg ('type','tol','sig','format','unit','calc',
 				 'samples') {
 		    $$args_ref{$arg}=
 			&Apache::lonxml::get_param($arg,$parstack,$safeeval);
@@ -235,7 +240,7 @@ sub end_numericalresponse {
 	    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);
+						      $formats[0],\@incorrect,$safeeval);
 	    my @alphabet=('A'..'Z');
 	    if ($target eq 'web') {
 		if ($tag eq 'numericalresponse') {
@@ -305,6 +310,8 @@ sub end_numericalresponse {
 	    $Apache::lonhomework::analyze{"$part_id.type"} = $tag;
 	    my (@incorrect)=&Apache::lonxml::get_param_var('incorrect',$parstack,$safeeval);
 	    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);
@@ -331,11 +338,13 @@ 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.']'; }
@@ -412,7 +421,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;}
@@ -426,13 +437,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';
@@ -441,22 +448,16 @@ 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 ($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();
@@ -473,7 +474,7 @@ sub make_numerical_bubbles {
 	    &Math::Random::random_set_seed(@oldseed);
 	    if (defined($format) && $format ne '') {
 		foreach my $value (@bubble_values) {
-		    $value=&format_number($value,$format,$target);
+		    $value=&format_number($value,$format,$target,$safeeval);
 		}
 	    }
 	    return @bubble_values;
@@ -493,7 +494,7 @@ sub make_numerical_bubbles {
     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);
+					       $format,$target,$safeeval);
 
     }
     &Math::Random::random_set_seed(@oldseed);
@@ -553,9 +554,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);
@@ -563,6 +562,8 @@ sub start_stringresponse {
 			 [['cs','Case Sensitive'],['ci','Case Insensitive'],
 			  ['mc','Case Insensitive, Any Order'],
 			  ['re','Regular Expression']],$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;
@@ -575,8 +576,13 @@ sub start_stringresponse {
 	}
     } elsif ($target eq 'web') {
 	if (  &Apache::response::show_answer() ) {
-	    $Apache::inputtags::answertxt{$id}=
-		&Apache::lonxml::get_param('answer',$parstack,$safeeval);
+	    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();
@@ -603,6 +609,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]/) {
@@ -667,6 +684,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') {