--- loncom/homework/caparesponse/caparesponse.pm	2005/12/06 10:16:56	1.185
+++ loncom/homework/caparesponse/caparesponse.pm	2006/06/19 16:16:21	1.192
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.185 2005/12/06 10:16:56 albertel Exp $
+# $Id: caparesponse.pm,v 1.192 2006/06/19 16:16:21 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -29,6 +29,8 @@
 package Apache::caparesponse;
 use strict;
 use capa;
+use Safe::Hole;
+use Apache::lonmaxima();
 use Apache::lonlocal;
 use Apache::lonnet;
 
@@ -191,17 +193,22 @@ sub start_numericalresponse {
 						    $safeeval);
 	    for (my $i=0; $i <= $#answers; $i++) {
 		my $answer=$answers[$i];
-		my $format;
-		if ($#formats > 0) {
-		    $format=$formats[$i];
+		if ( scalar(@$tagstack)
+		     && $tagstack->[-1] ne 'numericalresponse') {
+		    $answertxt.=$answer.',';
 		} else {
-		    $format=$formats[0];
+		    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.',';
 		}
-		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') {
@@ -242,7 +249,11 @@ sub check_submission {
     }
     
     if ($tag eq 'formularesponse') {
-	$$args_ref{'type'}='fml';
+	if ($$args_ref{'samples'}) {
+	    $$args_ref{'type'}='fml';
+	} else {
+	    $$args_ref{'type'}='math';
+	}
     } elsif ($tag eq 'numericalresponse') {
 	$$args_ref{'type'}='float';
     }
@@ -285,12 +296,15 @@ sub end_numericalresponse {
     my $partid = $Apache::inputtags::part;
     my $id = $Apache::inputtags::response[-1];
     my $tag;
+    my $safehole = new Safe::Hole;
     $safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
+    $safehole->wrap(\&Apache::lonmaxima::maxima_check,$safeeval,'&maxima_check');
+
     if (scalar(@$tagstack)) { $tag=$$tagstack[-1]; }
     if ( $target eq 'grade' && &Apache::response::submitted() ) {
 	&Apache::response::setup_params($tag,$safeeval);
 	if ($Apache::lonhomework::type eq 'exam' && 
-	    $tag eq 'formularesponse') {
+	    (($tag eq 'formularesponse') || ($tag eq 'mathresponse'))) {
 	    $increment=&Apache::response::scored_response($partid,$id);
 	} else {
 	    my $response = &Apache::response::getresponse();
@@ -357,10 +371,6 @@ sub end_numericalresponse {
 			    $bubble_display->[$ind].'</td>';
 		    }
 		    $result.='</tr></table>';
-		} elsif ($tag eq 'formularesponse') {
-		    $result.= '<br /><br /><font color="red">
-                           <textarea name="HWVAL_'.$id.'" rows="4" cols="50">
-                           </textarea></font> <br /><br />';
 		}
 	    } elsif ($target eq 'tex') {
 		if ((defined $unit) and ($unit=~/\S/) and ($Apache::lonhomework::type eq 'exam')) {
@@ -388,14 +398,7 @@ sub end_numericalresponse {
 		    }
 		    $result.='\end{enumerate}';
 		} else {
-		    $result.='\fbox{\fbox{\parbox{\textwidth-5mm}{\strut\\\\\strut\\\\\strut\\\\\strut\\\\}}}';
-		    my $repetition = &Apache::response::repetition();
-		    $result.='\begin{enumerate}';
-		    for (my $i=0;$i<$repetition;$i++) {
-			$result.='\item[\textbf{'.($Apache::lonxml::counter+$i).'}.]\textit{Leave blank on scoring form}\vskip 0 mm';
-		    }
-		    $increment=$repetition;
-		    $result.= '\end{enumerate}';
+		    $increment = &Apache::response::repetition();
 		}
 	    }
 	}
@@ -604,7 +607,7 @@ sub format_number {
     my $ans;
     if ($format eq '') {
 	#What is the number? (integer,decimal,floating point)
-	if ($number=~/^(\d*\.?\d*)(E|e)(\d*)$/) {
+	if ($number=~/^(\d*\.?\d*)(E|e)[+\-]?(\d*)$/) {
 	    $format = '3e';
 	} elsif ($number=~/^(\d*)\.(\d*)$/) {
 	    $format = '4f';
@@ -782,7 +785,7 @@ sub start_stringresponse {
 
 sub end_stringresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-    my $increment=1;
+
     my $result = '';
     my $part=$Apache::inputtags::part;
     my $id=$Apache::inputtags::response[-1];
@@ -798,7 +801,8 @@ sub end_stringresponse {
 	$safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
 	if ($Apache::lonhomework::type eq 'exam' ||
 	    &Apache::response::submitted('scantron')) {
-	    $increment=&Apache::response::scored_response($part,$id);
+	    &Apache::response::scored_response($part,$id);
+
 	} else {
 	    my $response = &Apache::response::getresponse();
 	    if ( $response =~ /[^\s]/) {
@@ -851,19 +855,6 @@ sub end_stringresponse {
 		$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::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");
@@ -917,7 +908,7 @@ sub end_stringresponse {
     }
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || 
 	$target eq 'tex' || $target eq 'analyze') {
-	&Apache::lonxml::increment_counter($increment);
+	&Apache::lonxml::increment_counter(&Apache::response::repetition());
     }
     &Apache::response::end_response;
     return $result;