--- loncom/homework/caparesponse/caparesponse.pm	2002/10/17 14:40:58	1.66
+++ loncom/homework/caparesponse/caparesponse.pm	2002/11/25 21:36:42	1.73
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.66 2002/10/17 14:40:58 sakharuk Exp $
+# $Id: caparesponse.pm,v 1.73 2002/11/25 21:36:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -89,7 +89,8 @@ sub start_numericalresponse {
       $result.=&Apache::edit::text_arg('Format:','format',$token,4);
     } elsif ($token->[1] eq 'stringresponse') {
       $result.=&Apache::edit::select_arg('Type:','type',
-					 ['cs','ci','mc'],$token);
+		 [['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);
     }
@@ -112,6 +113,8 @@ sub start_numericalresponse {
     }
   } elsif ($target eq 'meta') {
     $result=&Apache::response::meta_package_write('numericalresponse');
+  } elsif ($target eq 'answer' || $target eq 'grade') {
+      &Apache::response::reset_params();
   }
   return $result;
 }
@@ -127,6 +130,9 @@ sub end_numericalresponse {
       my $id = $Apache::inputtags::response['-1'];
       my $response = $ENV{'form.HWVAL'.$id};
       if ( $response =~ /[^\s]/) {
+	if (!$Apache::lonxml::default_homework_loaded) {
+	    &Apache::lonxml::default_homework_load($safeeval);
+	}
 	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");
@@ -157,7 +163,6 @@ sub end_numericalresponse {
       }
     }
   } elsif ($target eq 'web' || $target eq 'tex') {
-    if ($Apache::lonhomework::type ne 'exam') {
       my $award = $Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
       my $status = $Apache::inputtags::status['-1'];
       if ($award =~ /^correct/ || $status eq "SHOW_ANSWER" ) {
@@ -199,7 +204,7 @@ sub end_numericalresponse {
 	     $result.="}. \\vskip 0 mm ";
 	   }
        }
-    } else {
+      if ($Apache::lonhomework::type eq 'exam') {
       	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);
@@ -223,6 +228,7 @@ sub end_numericalresponse {
 	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') {
+	    my $id=$Apache::inputtags::response[-1];
 	    $result.= '<table border="1"><tr>';
 	    for ($ind=0;$ind<$number_of_bubbles;$ind++) {
 		my $ans;
@@ -241,7 +247,7 @@ sub end_numericalresponse {
 		    }
 		    $ans = sprintf('%.'.$format,$bubbles_values[$ind]);
 		}
-		    $result.='<td>'.$alphabet[$ind].': '.$ans.'</td>';
+		    $result.='<td><input type="radio" name="HWVAL'.$id.'" value="'.$ans.'"><b>'.$alphabet[$ind].'</b>: '.$ans.'</td>';
 	    }
 	    $result.='</tr></table>';
 	} elsif ($target eq 'tex') {
@@ -278,7 +284,7 @@ sub end_numericalresponse {
 			    my $power = $2;
 			    $power=~s/^\+//;
 			    $power=~s/^(-?)0+(\d+)//;
-			    $ans=$number.'$\times 10^{'.$1.$2.'}$';
+			    $ans=$number.'$\times 10^{'.$1.$2.'}$'; #'stupidemacs
 			} 
 		    } else {
 			my $badans = $bubbles_values[$ind];
@@ -297,7 +303,7 @@ sub end_numericalresponse {
 			    my $power = $2;
 			    $power=~s/^\+//;
 			    $power=~s/^(-?)0+(\d+)//;
-			    $ans=$number.'$\times 10^{'.$1.$2.'}$';
+			    $ans=$number.'$\times 10^{'.$1.$2.'}$'; #'stupidemacs
 			} 
 		    }
 		    $result.='\hskip -3 mm {\small \textbf{'.$alphabet[$ind].'}}$\bigcirc$\hskip -2 mm & {\small '.$ans.'} ';
@@ -308,10 +314,7 @@ sub end_numericalresponse {
 		$result.='\\\\\end{tabular}\vskip 0 mm ';    
 	    }
 	    $result.='\end{enumerate}';
-	    $Apache::lonxml::counter++;		    
-	    my %moreenv;
-	    $moreenv{'form.counter'}=$Apache::lonxml::counter;
-	    &Apache::lonnet::appenv(%moreenv);   
+	    &Apache::lonxml::increment_counter();
 	}
     }
   } elsif ($target eq 'edit') {
@@ -357,8 +360,8 @@ sub end_numericalresponse {
 	      }
 	  }
 	  if ($target eq 'answer') {
-	      if ($high) { $ans.=' ['.$low.','.$high.'] '; }
-	      if ($sighigh) { $ans.= "Sig <i>$siglow - $sighigh</i>"; }
+	      if ($high) { $ans.=' ['.$low.','.$high.']'; }
+	      if ($sighigh) { $ans.= " Sig <i>$siglow - $sighigh</i>"; }
 	      $result.=&Apache::response::answer_part($$tagstack[-1],$ans);
 	  } elsif ($target eq 'analyze') {
 	      push (@{ $Apache::lonhomework::analyze{"$part_id.answer"} },