--- loncom/homework/caparesponse/caparesponse.pm	2005/01/26 22:43:43	1.161
+++ loncom/homework/caparesponse/caparesponse.pm	2005/01/31 22:00:40	1.162
@@ -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.162 2005/01/31 22:00:40 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;
@@ -137,7 +137,6 @@ sub end_numericalresponse {
 	    $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,
@@ -154,7 +153,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 +184,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'});
 		}
@@ -612,14 +611,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 ''; }
 	    my $response = &Apache::response::getresponse();
 	    if ( $response =~ /[^\s]/) {
 		my %previous=&Apache::response::check_for_previous($response,