--- loncom/homework/caparesponse/caparesponse.pm	2003/04/08 04:00:23	1.91
+++ loncom/homework/caparesponse/caparesponse.pm	2003/04/21 17:51:46	1.94
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.91 2003/04/08 04:00:23 albertel Exp $
+# $Id: caparesponse.pm,v 1.94 2003/04/21 17:51:46 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -101,19 +101,28 @@ sub end_numericalresponse {
 	    my %previous = &Apache::response::check_for_previous($response,$partid,$id);
 	    $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
 	    &Apache::lonxml::debug("submitted a $response<br>\n");
-	    &Apache::lonxml::debug($$parstack[$#$parstack] . "\n<br>");
+	    &Apache::lonxml::debug($$parstack[-1] . "\n<br>");
 
 	    if ($ENV{'form.submitted'} eq 'scantron') {
-		&Apache::response::setrandomnumber();
-		#FIXME the 8 here is based off of number of powers need a parameter
-		my $ind=&Math::Random::random_uniform_integer(1,0,8);
-		if ($ind eq $response) { $ad='CORRECT'; } else { $ad='INCORRECT'; }
+		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;
 	    }
-	    $response =~ s/\\/\\\\/g;
-	    $response =~ s/\'/\\\'/g;
 	    &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}.'"';
@@ -138,16 +147,17 @@ sub end_numericalresponse {
 						     $safeeval);
 	my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
 	my $status = $Apache::inputtags::status['-1'];
-	if ($award =~ /^correct/ || $status eq "SHOW_ANSWER" ) {
+	if ($award =~ /^correct/ || $status eq "SHOW_ANSWER" || $ENV{'form.texaward'} eq '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="<br />The correct answer is ";
 	    } elsif ($target eq 'tex') {
-		#$result='\vskip 0 mm The correct answer is \\texttt{';
+		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];
@@ -165,7 +175,9 @@ sub end_numericalresponse {
 		    &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);
@@ -175,9 +187,11 @@ sub end_numericalresponse {
 	    chop $result;
 	    if ($target eq 'web') {
 		$result.=" $unit.<br />";
-	    } elsif ($target eq 'tex') {
-		#$result.=&Apache::lonxml::latex_special_symbols($unit);
-		#$result.="}. \\vskip 0 mm ";
+	    } 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') {
@@ -234,13 +248,10 @@ sub end_numericalresponse {
 		    $result.='\end{enumerate}';
 		} else {
 		    $result.='\fbox{\fbox{\parbox{\textwidth-5mm}{\strut\\\\\strut\\\\\strut\\\\\strut\\\\}}}';
-		    my $id = $Apache::inputtags::part;
-		    my $weight = &Apache::lonnet::EXT("resource.$id.weight");
-		    my $repetition = int $weight/9;
-		    if ($weight % 9 != 0) {$repetition++;}
+		    my $repetition = &Apache::response::repetition();
 		    $result.='\begin{enumerate}';
 		    for (my $i=0;$i<$repetition;$i++) {
-			$result.='\item[\textbf{'.$Apache::lonxml::counter.'}.]\textit{Leave blank on scoring form}\vskip 0 mm';
+			$result.='\item[\textbf{'.($Apache::lonxml::counter+$i).'}.]\textit{Leave blank on scoring form}\vskip 0 mm';
 		    }
 		    $increment=$repetition;
 		    $result.= '\end{enumerate}';