--- loncom/homework/structuretags.pm	2004/05/14 22:11:05	1.248
+++ loncom/homework/structuretags.pm	2004/05/27 04:32:19	1.251
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.248 2004/05/14 22:11:05 albertel Exp $
+# $Id: structuretags.pm,v 1.251 2004/05/27 04:32:19 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -178,7 +178,7 @@ sub setup_rndseed {
 	}
 	if ($safeeval) {
 	    &Apache::lonxml::debug("Setting rndseed to $rndseed");
-	    &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval);
+	    &Apache::run::run('$external::randomseed="'.$rndseed.'";',$safeeval);
 	}
     }
     return $rndseed;
@@ -593,10 +593,14 @@ sub end_problem {
     my $status=$Apache::inputtags::status['-1'];
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
 	$target eq 'tex') {
-	if ( $target eq 'grade' && $Apache::inputtags::part eq '0' &&
-	     ($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode)) {
+	if ( $target eq 'grade' && $Apache::inputtags::part eq '0') {
 	    # if part is zero, no <part>s existed, so we need to the grading
-	    &Apache::inputtags::grade;
+	    if ($status eq 'CAN_ANSWER' ||$Apache::lonhomework::scantronmode) {
+		&Apache::inputtags::grade;
+	    } else {
+		# move any submission data to .hidden
+		&Apache::inputtags::hidealldata($Apache::inputtags::part);
+	    }
 	} elsif ( ($target eq 'web' || $target eq 'tex') &&
 		  $Apache::inputtags::part eq '0' &&
 		  $status ne 'UNCHECKEDOUT') {
@@ -979,12 +983,13 @@ sub shuffle {
     my $a=shift;
     my $i;
     if (defined(@$a)) {
-	&Apache::response::setrandomnumber();
+	&Apache::response::pushrandomnumber();
 	for($i=@$a;--$i;) {
 	    my $j=int(&Math::Random::random_uniform() * ($i+1));
 	    next if $i == $j;
 	    @$a[$i,$j] = @$a[$j,$i];
 	}
+	&Apache::response::poprandomnumber();
     }
 }
 
@@ -1093,10 +1098,14 @@ sub end_part {
     my $result='';
     if ( $target eq 'meta' ) {
 	$result='';
-    } elsif ($target eq 'grade' && 
-	     ($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode) &&
-	     !$hidden) {
-	$result=&Apache::inputtags::grade;
+    } elsif ($target eq 'grade') {
+	if (($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode) &&
+	    !$hidden) {
+	    $result=&Apache::inputtags::grade;
+	} else {
+	    # move any submission data to .hidden
+	    &Apache::inputtags::hidealldata($Apache::inputtags::part);
+	}
     } elsif (($target eq 'web' || $target eq 'tex') && !$hidden ) {
 	my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part,
 							$target);