--- loncom/homework/lonhomework.pm	2003/03/25 23:07:07	1.117
+++ loncom/homework/lonhomework.pm	2003/04/03 21:46:27	1.119
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.117 2003/03/25 23:07:07 albertel Exp $
+# $Id: lonhomework.pm,v 1.119 2003/04/03 21:46:27 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -65,11 +65,12 @@ sub get_target {
 	 && ($ENV{'form.grade_target'} eq 'tex')) {
       return ($ENV{'form.grade_target'});
     } elsif ( defined($ENV{'form.grade_target'}  ) 
-	 && ($Apache::lonhomework::viewgrades == 'F' )) {
+	 && ($Apache::lonhomework::viewgrades eq 'F' )) {
       return ($ENV{'form.grade_target'});
     }
  
-    if ( defined($ENV{'form.submitted'})) {
+    if ( defined($ENV{'form.submitted'}) &&
+	 ( !defined($ENV{'form.resetdata'}))) {
       return ('grade', 'web');
     } else {
       return ('web');
@@ -599,7 +600,6 @@ sub handler {
   #my $t0 = [&gettimeofday()];
   my $request=$_[0];
 
-#  if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;}
   $Apache::lonxml::debug=$ENV{'user.debug'};
 
   if (&setupheader($request)) { return OK; }
@@ -631,11 +631,16 @@ sub handler {
     }
   }
 
+  my ($symb) = &Apache::lonxml::whichuser();
+  &Apache::lonxml::debug('symb is '.$symb);
+  if ($ENV{'request.state'} eq "construct" || $symb eq '') {
+      if ($ENV{'form.resetdata'} eq 'Reset Submissions' ||
+	  $ENV{'form.resetdata'} eq 'New Problem Variation' ) {
+	  my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
+	  &Apache::lonnet::tmpreset($symb,'',$domain,$name);
+      }
+  }
   if ($ENV{'request.state'} eq "construct") {
-    if ($ENV{'form.resetdata'} eq 'Reset Submissions') {
-      my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
-      &Apache::lonnet::tmpreset($symb,'',$domain,$name);
-    }
     if ( -e $file ) {
       if (!(defined $ENV{'form.problemmode'})) {
 	#first visit to problem in construction space