--- loncom/homework/caparesponse/caparesponse.pm	2003/04/21 17:51:46	1.94
+++ loncom/homework/caparesponse/caparesponse.pm	2003/04/21 20:59:02	1.95
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.94 2003/04/21 17:51:46 sakharuk Exp $
+# $Id: caparesponse.pm,v 1.95 2003/04/21 20:59:02 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -90,57 +90,63 @@ sub end_numericalresponse {
     if (!$Apache::lonxml::default_homework_loaded) {
 	&Apache::lonxml::default_homework_load($safeeval);
     }
-    if ( $target eq 'grade' && defined $ENV{'form.submitted'}) {
+    if ( $target eq 'grade' && defined($ENV{'form.submitted'})) {
 	&Apache::response::setup_params($$tagstack[-1]);
 	$safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
 	my $partid = $Apache::inputtags::part;
 	my $id = $Apache::inputtags::response['-1'];
-	my $response = &Apache::response::getresponse();
-	if ( $response =~ /[^\s]/) {
-	    my $ad;
-	    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[-1] . "\n<br>");
-
-	    if ($ENV{'form.submitted'} eq 'scantron') {
-		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;
-	    }
-	    &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}.'"';
-	    }
-	    if ($$tagstack[-1] eq 'formularesponse') {
-		$expression.=';my $type="fml";';
-	    } elsif ($$tagstack[-1] eq 'numericalresponse') {
-		$expression.=';my $type="float";';
+	if ($Apache::lonhomework::type eq 'exam' && 
+	    ($$tagstack[-1] eq 'formularesponse' ||
+	     $$tagstack[-1] eq 'stringresponse')) {
+	    $increment=&Apache::response::scored_response($partid,$id);
+	} else {
+	    my $response = &Apache::response::getresponse();
+	    if ( $response =~ /[^\s]/) {
+		my $ad;
+		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[-1] . "\n<br>");
+		
+		if ($ENV{'form.submitted'} eq 'scantron') {
+		    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;
+		}
+		&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}.'"';
+		}
+		if ($$tagstack[-1] eq 'formularesponse') {
+		    $expression.=';my $type="fml";';
+		} elsif ($$tagstack[-1] eq 'numericalresponse') {
+		    $expression.=';my $type="float";';
+		}
+		$expression.="');";
+		$result = &Apache::run::run($expression,$safeeval);
+		my ($awards) = split /:/ , $result;
+		($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
+		&Apache::lonxml::debug("$expression");
+		&Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
+		&Apache::response::handle_previous(\%previous,$ad);
+		$Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
+		$result='';
 	    }
-	    $expression.="');";
-	    $result = &Apache::run::run($expression,$safeeval);
-	    my ($awards) = split /:/ , $result;
-	    ($ad) = &Apache::inputtags::finalizeawards(split /,/ , $awards);
-	    &Apache::lonxml::debug("$expression");
-	    &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
-	    &Apache::response::handle_previous(\%previous,$ad);
-	    $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
-	    $result='';
 	}
     } elsif ($target eq 'web' || $target eq 'tex') {
 	my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,