--- loncom/homework/optionresponse.pm	2004/08/25 20:00:31	1.119
+++ loncom/homework/optionresponse.pm	2005/01/31 22:00:40	1.124
@@ -1,7 +1,7 @@
 # LearningOnline Network with CAPA
 # option list style responses
 #
-# $Id: optionresponse.pm,v 1.119 2004/08/25 20:00:31 albertel Exp $
+# $Id: optionresponse.pm,v 1.124 2005/01/31 22:00:40 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -182,7 +182,7 @@ sub end_foilgroup {
 	my $part_id="$Apache::inputtags::part.$Apache::inputtags::response[-1]";
 	push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt);
     } elsif ( $target eq 'grade') {
-      if ( defined $ENV{'form.submitted'}) {
+      if ( &Apache::response::submitted()) {
 	my @whichopt = &whichfoils($max,$randomize);
 	my $temp=1;my $name;
 	my %responsehash;
@@ -192,7 +192,7 @@ sub end_foilgroup {
 	my $ignored=0;
 	foreach $name (@whichopt) {
 	  my $response=&Apache::response::getresponse($temp);
-	  if ($ENV{'form.submitted'} eq 'scantron') {
+	  if ($ENV{'form.submitted'} eq 'scantron' && $response=~/\S/) {
 	      $response = $opt[$response];
 	  }
 	  if ( $response =~ /[^\s]/) {
@@ -220,7 +220,16 @@ sub end_foilgroup {
 	    $responsestr;
 	$Apache::lonhomework::results{"resource.$part.$id.submissiongrading"}=$gradestr;
 	
-	if (!$Apache::lonhomework::scantronmode) {
+	if ($Apache::lonhomework::type eq 'survey') {
+	    if ($ignored == 0) {
+		my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='SUBMITTED';
+		&Apache::response::handle_previous(\%previous,$ad);
+	    } elsif ($wrong==0 && $right==0) {
+	    } else {
+		my $ad=$Apache::lonhomework::results{"resource.$part.$id.awarddetail"}='MISSING_ANSWER';
+		&Apache::response::handle_previous(\%previous,$ad);
+	    }
+	} elsif (!$Apache::lonhomework::scantronmode) {
 	    my $ad;
 	    if ($wrong==0 && $ignored==0) {
 		$ad='EXACT_ANS';
@@ -238,7 +247,11 @@ sub end_foilgroup {
 	} else {
 	    my $ad;
 	    if ($wrong==0 && $right==0) {
-		#nothing submitted
+		#nothing submitted only assign a score if we 
+		#need to override a previous grade
+		if (defined($Apache::lonhomework::history{"resource.$part.$id.awarddetail"})) {
+		    $ad='ASSIGNED_SCORE';
+		}
 	    } else {
 		$ad='ASSIGNED_SCORE';
 	    }
@@ -610,10 +623,16 @@ sub end_foil {
   if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' 
       || $target eq 'tex' || $target eq 'analyze') {
     my $value = &Apache::lonxml::get_param('value',$parstack,$safeeval);
+    if ($target eq 'tex' && $Apache::lonhomework::type eq 'exam') {
+	$text='\vskip 5mm $\triangleright$ '.$text;
+    }
     if ($value ne 'unused') {
       my $name = &Apache::lonxml::get_param('name',$parstack,$safeeval);
       &Apache::lonxml::debug("Got a name of :$name:");
-      if (!$name) { $name=$Apache::lonxml::curdepth; }
+      if (!$name) {
+	  &Apache::lonxml::error("Foils without names exist. This can cause problems to malfunction.");
+	  $name=$Apache::lonxml::curdepth;
+      }
       &Apache::lonxml::debug("Using a name of :$name:");
       if (defined($Apache::response::foilnames{$name})) {
 	  &Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name));
@@ -624,20 +643,12 @@ sub end_foil {
 	   && !&Apache::response::showallfoils() ) {
 	push @{ $Apache::response::conceptgroup{'names'} }, $name;
 	$Apache::response::conceptgroup{"$name.value"} = $value;
-	if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
-	    $Apache::response::conceptgroup{"$name.text"} = '\vskip 4 mm $\triangleright$ '.$text;
-	} else {
-	    $Apache::response::conceptgroup{"$name.text"} = $text;
-	}
+	$Apache::response::conceptgroup{"$name.text"} = $text;
 	$Apache::response::conceptgroup{"$name.location"} = $location;
       } else {
 	push @{ $Apache::response::foilgroup{'names'} }, $name;
 	$Apache::response::foilgroup{"$name.value"} = $value;
-	if ($target eq 'tex' and $Apache::lonhomework::type eq 'exam') {
-	    $Apache::response::foilgroup{"$name.text"} = '\vskip 5 mm $\triangleright$ '.$text;
-	} else {
-	    $Apache::response::foilgroup{"$name.text"} = $text;
-	}
+	$Apache::response::foilgroup{"$name.text"} = $text;
 	$Apache::response::foilgroup{"$name.location"} = $location;
       }
     }