--- loncom/homework/caparesponse/caparesponse.pm	2003/01/13 21:22:00	1.76
+++ loncom/homework/caparesponse/caparesponse.pm	2003/03/13 16:20:47	1.82
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.76 2003/01/13 21:22:00 sakharuk Exp $
+# $Id: caparesponse.pm,v 1.82 2003/03/13 16:20:47 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -85,14 +85,17 @@ sub start_numericalresponse {
     $result.=&Apache::edit::tag_start($target,$token);
     $result.=&Apache::edit::text_arg('Answer:','answer',$token);
     if ($token->[1] eq 'numericalresponse') {
-      $result.=&Apache::edit::text_arg('Unit:','unit',$token,5);
-      $result.=&Apache::edit::text_arg('Format:','format',$token,4);
+      $result.=&Apache::edit::text_arg('Unit:','unit',$token,5).
+                         &Apache::loncommon::help_open_topic('Physical_Units');
+      $result.=&Apache::edit::text_arg('Format:','format',$token,4).
+              &Apache::loncommon::help_open_topic('Numerical_Response_Format');
     } elsif ($token->[1] eq 'stringresponse') {
       $result.=&Apache::edit::select_arg('Type:','type',
 		 [['cs','Case Sensitive'],['ci','Case Insensitive'],
 		  ['mc','Case Insensitive, Any Order']],$token);
     } elsif ($token->[1] eq 'formularesponse') {
-      $result.=&Apache::edit::text_arg('Sample Points:','samples',$token,40);
+      $result.=&Apache::edit::text_arg('Sample Points:','samples',$token,40).
+             &Apache::loncommon::help_open_topic('Formula_Response_Sampling');
     }
     $result.=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
   } elsif ($target eq 'modified') {
@@ -141,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}.'"';
@@ -212,6 +215,9 @@ sub end_numericalresponse {
       	my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
 	my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);
 	my $unit=&Apache::lonxml::get_param_var('unit',$parstack,$safeeval);
+	if (defined $unit and $Apache::lonhomework::type eq 'exam') {
+	  $result.=' \textit{(in} \verb|'.$unit.'|\textit{)} ';
+        }
 	my $number_of_bubbles = 8; #default values for number of bubbles
 	my @bubbles_values = (); 
 	my @factors = (1.13,1.17,1.25,1.33,1.45); #default values of factors
@@ -220,15 +226,15 @@ 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'};}
-	my $randomseed = 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]);
-	}	    
+	    $bubbles_values[$ind] = $answers[0]*($factor**($power-$powers[$#powers-$ind]));
+	}
 	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');
         if ($target eq 'web') {
@@ -326,9 +332,17 @@ sub end_numericalresponse {
 	     &Apache::lonxml::increment_counter();
          } else {
 	     $result.='\fbox{\fbox{\parbox{\textwidth-5mm}{\strut\\\\\strut\\\\\strut\\\\\strut\\\\\strut\\\\\strut\\\\}}}';
-	     $result.= '\begin{enumerate}\item[\textbf{'.$Apache::lonxml::counter.'}.]\textit{Live blank on scoring form}\vskip 0 mm \end{enumerate}';
-	     &Apache::lonxml::increment_counter();
-	 }
+	    my $id = $Apache::inputtags::part;
+	    my $weight = &Apache::lonnet::EXT("resource.$id.weight");
+            my $repetition = int $weight/9;
+	    if ($weight % 9 != 0) {$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';
+		 &Apache::lonxml::increment_counter();
+	      }
+	      $result.= '\end{enumerate}';
+	    }
 	}
     }
   } elsif ($target eq 'edit') {