--- loncom/homework/inputtags.pm	2003/04/02 19:51:24	1.86
+++ loncom/homework/inputtags.pm	2003/04/08 02:37:58	1.89
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.86 2003/04/02 19:51:24 sakharuk Exp $
+# $Id: inputtags.pm,v 1.89 2003/04/08 02:37:58 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -89,7 +89,7 @@ sub start_textfield {
 	if ( $cols eq '') { $cols = 80; }
 	my $rows = &Apache::lonxml::get_param('rows',$parstack,$safeeval);
 	if ( $rows eq '') { $rows = 10; }
-	$result= '<textarea name="HWVAL'.$resid.'" '.
+	$result= '<textarea name="HWVAL_'.$resid.'" '.
 	    "rows=\"$rows\" cols=\"$cols\">".$oldresponse;
 	if ($oldresponse ne '') {
 	    #get rid of any startup text if the user has already responded
@@ -104,9 +104,9 @@ sub start_textfield {
     }
   } elsif ($target eq 'grade') {
     my $seedtext=&Apache::lonxml::get_all_text("/textfield",$parser);
-    if ($seedtext eq $ENV{'form.HWVAL'.$resid}) {
+    if ($seedtext eq $ENV{'form.HWVAL_'.$resid}) {
       # if the seed text is still there it wasn't a real submission
-      $ENV{'form.HWVAL'.$resid}='';
+      $ENV{'form.HWVAL_'.$resid}='';
     }
   } elsif ($target eq 'edit') {
     $result.=&Apache::edit::tag_start($target,$token);
@@ -164,7 +164,7 @@ sub start_textline {
       my $id=$Apache::inputtags::response[-1];
       my $oldresponse = &HTML::Entities::encode($Apache::lonhomework::history{"resource.$partid.$id.submission"});
       if ($Apache::lonhomework::type ne 'exam') {
-        $result= '<input type="text" name="HWVAL'.$id.'" value="'.
+        $result= '<input type="text" name="HWVAL_'.$id.'" value="'.
 	    $oldresponse.'" size="'.$size.'" maxlength="'.$maxlength.'" />';
       }
     } else {
@@ -340,6 +340,16 @@ sub decideoutput {
   return ($button,$message,$previousmsg);
 }
 
+sub removealldata {
+    my ($id)=@_;
+    foreach my $key (keys(%Apache::lonhomework::results)) {
+	if (($key =~ /^resource\.\Q$id\E\./) && ($key !~ /\.collaborators$/)) {
+	    &Apache::lonxml::debug("Removing $key");
+	    delete($Apache::lonhomework::results{$key});
+	}
+    }
+}
+
 sub setgradedata {
   my ($award,$id,$previously_used) = @_;
   # if the student already has it correct, don't modify the status
@@ -372,7 +382,9 @@ sub setgradedata {
     } elsif ( $award eq 'DRAFT' ) {
       $Apache::lonhomework::results{"resource.$id.solved"} = '';
     } elsif ( $award eq 'NO_RESPONSE' ) {
-      return '';
+	#no real response so delete any data that got stored
+	&removealldata($id);
+	return '';
     } else {
       $Apache::lonhomework::results{"resource.$id.solved"} =
 	'incorrect_attempted';
@@ -386,12 +398,7 @@ sub setgradedata {
     } elsif ( $previously_used eq 'PREVIOUSLY_LAST') {
       #delete all data as they student didn't do anything, but save
       #the list of collaborators.
-      foreach my $key (keys(%Apache::lonhomework::results)) {
-	if (($key =~ /^resource\.$id\./) && ($key !~ /\.collaborators$/)) {
-	  &Apache::lonxml::debug("Removing $key");
-	  delete($Apache::lonhomework::results{$key});
-	}
-      }
+      &removealldata($id);
       #and since they didn't do anything we were never here
       return '';
     } else {
@@ -400,12 +407,7 @@ sub setgradedata {
   } elsif ( $Apache::lonhomework::history{"resource.$id.solved"} =~
 	    /^correct/ ) {
       #delete all data as they student already has it correct
-      foreach my $key (keys(%Apache::lonhomework::results)) {
-	  if (($key =~ /^resource\.$id\./) && ($key !~ /\.collaborators$/)) {
-	      &Apache::lonxml::debug("Removing $key");
-	      delete($Apache::lonhomework::results{$key});
-	  }
-      }
+      &removealldata($id);
       #and since they didn't do anything we were never here
       return '';
   }