--- loncom/homework/lonhomework.pm	2001/08/20 23:31:07	1.57
+++ loncom/homework/lonhomework.pm	2001/11/05 22:49:14	1.62
@@ -10,6 +10,7 @@ use Apache::lonxml;
 use Apache::lonnet;
 use Apache::inputtags;
 use Apache::structuretags;
+use Apache::randomlabel;
 use Apache::response;
 use Apache::hint;
 use Apache::outputtags;
@@ -22,24 +23,25 @@ sub BEGIN {
 
 sub get_target {
   if ( $ENV{'request.state'} eq "published") {
-    if ( defined $ENV{'form.submitted'}) {
+    if ( defined($ENV{'form.submitted'})) {
       return ('grade', 'web');
     } else {
       return ('web');
     }
   } elsif ($ENV{'request.state'} eq "construct") {
-    if ( defined $ENV{'form.preview'}) {
-      if ( defined $ENV{'form.submitted'}) {
+    if ( defined($ENV{'form.preview'})) {
+      if ( defined($ENV{'form.submitted'})) {
 	return ('grade', 'web');
       } else {
 	return ('web');
       }
     } else {
       if ( $ENV{'form.problemmode'} eq 'View' ) {
-	if ( defined $ENV{'form.submitted'}) {
-	  return ('grade', 'web');
+	if ( defined($ENV{'form.submitted'}) &&
+	     (!defined($ENV{'form.resetdata'})) ) {
+	  return ('grade', 'web','answer');
 	} else {
-	  return ('web');
+	  return ('web','answer');
 	}
       } elsif ( $ENV{'form.problemmode'} eq 'Edit' ) {
 	if ( $ENV{'form.submitted'} eq 'edit' ) {
@@ -152,28 +154,6 @@ sub check_access {
   return ($status,$datemsg);
 }
 
-# ----------------------------------------------------------------- whichuser
-# returns a list of $symb, $courseid, $domain, $name that is correct for
-# calls to lonnet functions for this setup.
-# - looks for form.grade_ parameters
-sub whichuser {
-  my $symb=&Apache::lonnet::symbread();
-  my $courseid=$ENV{'request.course.id'};
-  my $domain=$ENV{'user.domain'};
-  my $name=$ENV{'user.name'};
-  if (defined($ENV{'form.grade_symb'})) {
-    my $tmp_courseid=$ENV{'form.grade_courseid'};
-    my $allowed=&Apache::lonnet::allowed('mgr',$tmp_courseid);
-    if ($allowed) {
-      $symb=$ENV{'form.grade_symb'};
-      $courseid=$ENV{'form.grade_courseid'};
-      $domain=$ENV{'form.grade_domain'};
-      $name=$ENV{'form.grade_username'};
-    }
-  }
-  return ($symb,$courseid,$domain,$name);
-}
-
 sub showhash {
   my (%hash) = @_;
   my $resultkey;
@@ -197,6 +177,7 @@ sub setupheader {
   } else {
     $request->content_type('text/html');
   }
+  &Apache::loncommon::no_cache($request);
   $request->send_http_header;
   return OK if $request->header_only;
   return ''
@@ -250,7 +231,6 @@ sub renderpage {
     if ($target eq 'web') {
       if (&Apache::lonnet::symbread() eq '') {
 	if ($ENV{'request.state'} eq "construct") {
-	  $request->print("In construction space, submissions ignored<br />");
 	} else {
 	  $request->print("Browsing or <a href=\"/adm/ambiguous\">ambiguous</a> reference, submissions ignored<br />");
 	}
@@ -372,6 +352,10 @@ sub handler {
   }
 
   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