--- loncom/homework/caparesponse/caparesponse.pm	2003/02/27 21:20:33	1.79
+++ loncom/homework/caparesponse/caparesponse.pm	2003/03/26 18:44:13	1.86
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.79 2003/02/27 21:20:33 sakharuk Exp $
+# $Id: caparesponse.pm,v 1.86 2003/03/26 18:44:13 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -144,7 +144,7 @@ sub end_numericalresponse {
 	$response =~ s/\'/\\\'/g;
 	&Apache::lonxml::debug("current $response");
 	my $expression="&caparesponse_check_list('".$response."','".
-	  $$parstack[$#$parstack];
+	    $$parstack[-1];
 	foreach my $key (keys(%Apache::inputtags::params)) {
 	  $expression.= ';my $'. #'
 	    $key.'="'.$Apache::inputtags::params{$key}.'"';
@@ -223,20 +223,20 @@ sub end_numericalresponse {
 	my $powers_number = 8; #default values for number of powers
 	my $symb;
 	if ($ENV{'form.symb'}=~/___\d+___/) {$symb=$ENV{'form.symb'};} else {$symb=$ENV{'request.symb'};}
-	srand(&Apache::lonnet::rndseed($symb,$ENV{'request.course.id'},
-                                                              $ENV{'user.domain'},$ENV{'user.name'}));
-	my $ind=1+int(rand()*($factors_number-1));
-	my $factor = $factors[$ind];
-	$ind=1+int(rand()*($powers_number-1));
+
+	&Apache::response::setrandomnumber();
+	my $ind=&Math::Random::random_uniform_integer(1,0,$#powers);
 	my $power = $powers[$ind];
+	$ind=&Math::Random::random_uniform_integer(1,0,$#factors);
+	my $factor = $factors[$ind];
 	for ($ind=0;$ind<$number_of_bubbles;$ind++) {
-	    $bubbles_values[$ind] = $answers[0]*$factor**($power-$powers[$powers_number-$ind-1]);
-	}	    
-	my @alphabet = ('A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P',
-			'Q','R','S','T','U','V','W','X','Y','Z');
+	    $bubbles_values[$ind] = $answers[0]*($factor**($power-$powers[$#powers-$ind]));
+	}
+	my @alphabet=('A'..'Z');
         if ($target eq 'web') {
 	  if ($$tagstack[-1] eq 'numericalresponse') {
 	    my $id=$Apache::inputtags::response[-1];
+	    if ($unit=~/\S/) {$result.=' (in '.$unit.')<br /><br />';}
 	    $result.= '<table border="1"><tr>';
 	    for ($ind=0;$ind<$number_of_bubbles;$ind++) {
 		my $ans;
@@ -259,9 +259,12 @@ sub end_numericalresponse {
 	    }
 	    $result.='</tr></table>';
 	  } elsif ($$tagstack[-1] eq 'formularesponse') {
-	    $result.= '<br /><br /><font color="red"> Formula have to be entered here! </font><br /><br />';
+	    $result.= '<br /><br /><font color="red"><textarea name="formulainput" rows="4" cols="50"> </textarea></font> <br /><br />';
 	  }
 	} elsif ($target eq 'tex') {
+	 if (defined $unit and $Apache::lonhomework::type eq 'exam') {
+	   $result.=' \textit{(in} \verb|'.$unit.'|\textit{)} ';
+         }
 	 if ($$tagstack[-1] eq 'numericalresponse') {
 	     my $max_val = 0;
 	     if ($formats[0]=~m/^(\d+)E([^\d]*)(\d*)$/) {
@@ -328,7 +331,7 @@ sub end_numericalresponse {
 	     $result.='\end{enumerate}';
 	     &Apache::lonxml::increment_counter();
          } else {
-	     $result.='\fbox{\fbox{\parbox{\textwidth-5mm}{\strut\\\\\strut\\\\\strut\\\\\strut\\\\\strut\\\\\strut\\\\}}}';
+	     $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;