--- loncom/homework/caparesponse/caparesponse.pm	2005/01/26 22:43:43	1.161
+++ loncom/homework/caparesponse/caparesponse.pm	2005/02/21 20:29:00	1.163
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # caparesponse definition
 #
-# $Id: caparesponse.pm,v 1.161 2005/01/26 22:43:43 albertel Exp $
+# $Id: caparesponse.pm,v 1.163 2005/02/21 20:29:00 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -128,7 +128,7 @@ sub end_numericalresponse {
     }
     my $tag;
     if (scalar(@$tagstack)) { $tag=$$tagstack[-1]; }
-    if ( $target eq 'grade' && defined($ENV{'form.submitted'})) {
+    if ( $target eq 'grade' && &Apache::response::submitted() ) {
 	&Apache::response::setup_params($tag,$safeeval);
 	$safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
 	my $partid = $Apache::inputtags::part;
@@ -136,16 +136,6 @@ sub end_numericalresponse {
 	if ($Apache::lonhomework::type eq 'exam' && 
 	    $tag eq 'formularesponse') {
 	    $increment=&Apache::response::scored_response($partid,$id);
-	} elsif ($Apache::lonhomework::type eq 'survey') {
-	    if ( !defined($ENV{'form.submitted'})) { return ''; }
-	    my $response = &Apache::response::getresponse();
-	    if ( $response =~ /[^\s]/) {
-		my %previous=&Apache::response::check_for_previous($response,
-								 $partid,$id);
-		$Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
-		my $ad=$Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}='SUBMITTED';
-		&Apache::response::handle_previous(\%previous,$ad);
-	    }
 	} else {
 	    my $response = &Apache::response::getresponse();
 	    if ( $response =~ /[^\s]/) {
@@ -154,7 +144,7 @@ sub end_numericalresponse {
 		&Apache::lonxml::debug("submitted a $response<br>\n");
 		&Apache::lonxml::debug($$parstack[-1] . "\n<br>");
 		
-		if ($ENV{'form.submitted'} eq 'scantron') {
+		if ( &Apache::response::submitted('scantron')) {
 		    my $number_of_bubbles = &Apache::lonnet::EXT('resource.'.$partid.'_'.$id.'.numbubbles');
 		    if (!$number_of_bubbles) { $number_of_bubbles=8; }
 		    my (@formats)=&Apache::lonxml::get_param_var('format',$parstack,$safeeval);
@@ -185,7 +175,7 @@ sub end_numericalresponse {
 		}
 		#sig fig don't make much sense either
 		if (($Apache::lonhomework::type eq 'exam' ||
-		     $ENV{'form.submitted'} eq 'scantron') &&
+		     &Apache::response::submitted('scantron')) &&
 		    $tag eq 'numericalresponse') {
 		    delete($$args_ref{'sig'});
 		}
@@ -214,6 +204,11 @@ sub end_numericalresponse {
 					   $Apache::inputtags::params{'sig'});
 		}
 		&Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
+		if ($Apache::lonhomework::type eq 'survey' &&
+		    ($ad eq 'INCORRECT' || $ad eq 'APPROX_ANS' ||
+		     $ad eq 'EXACT_ANS')) {
+		    $ad='SUBMITTED';
+		}
 		&Apache::response::handle_previous(\%previous,$ad);
 		$Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
 		$Apache::lonhomework::results{"resource.$partid.$id.awardmsg"}=$msg;
@@ -612,14 +607,13 @@ sub end_stringresponse {
     if (!$Apache::lonxml::default_homework_loaded) {
 	&Apache::lonxml::default_homework_load($safeeval);
     }
-    if ( $target eq 'grade' && defined($ENV{'form.submitted'})) {
+    if ( $target eq 'grade' && &Apache::response::submitted() ) {
 	&Apache::response::setup_params('stringresponse',$safeeval);
 	$safeeval->share_from('capa',['&caparesponse_capa_check_answer']);
 	if ($Apache::lonhomework::type eq 'exam' ||
-	    $ENV{'form.submitted'} eq 'scantron') {
+	    &Apache::response::submitted('scantron')) {
 	    $increment=&Apache::response::scored_response($part,$id);
-	} elsif ($Apache::lonhomework::type eq 'survey') {
-	    if ( !defined($ENV{'form.submitted'})) { return ''; }
+	} elsif (0 && $Apache::lonhomework::type eq 'survey') {
 	    my $response = &Apache::response::getresponse();
 	    if ( $response =~ /[^\s]/) {
 		my %previous=&Apache::response::check_for_previous($response,
@@ -671,6 +665,11 @@ sub end_stringresponse {
 		    ($ad,$msg) = &Apache::inputtags::finalizeawards(\@awards,\@msgs);
 		    &Apache::lonxml::debug("\n<br>result:$result:$Apache::lonxml::curdepth<br>\n");
 		}
+		if ($Apache::lonhomework::type eq 'survey' &&
+		    ($ad eq 'INCORRECT' || $ad eq 'APPROX_ANS' ||
+		     $ad eq 'EXACT_ANS')) {
+		    $ad='SUBMITTED';
+		}
 		&Apache::response::handle_previous(\%previous,$ad);
 		$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}=$ad;
 		$Apache::lonhomework::results{"resource.$part.$id.awardmsg"}=$msg;