--- loncom/homework/structuretags.pm	2003/04/03 14:53:44	1.160
+++ loncom/homework/structuretags.pm	2003/04/03 20:05:21	1.162
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.160 2003/04/03 14:53:44 albertel Exp $
+# $Id: structuretags.pm,v 1.162 2003/04/03 20:05:21 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -107,7 +107,7 @@ sub page_start {
 	    my ($symb)=&Apache::lonxml::whichuser();
 	    if ($symb eq '') {
 		my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference");
-		$help="Browsing or <a href=\"/adm/ambiguous\">ambiguous</a> reference, submissions ignored $help<br />";
+		$help="Browsing resource, all submissions are temporary.<br />";
 		$body_tag_start.=$help;
 	    }
 	}
@@ -135,9 +135,17 @@ sub get_resource_name {
 sub setup_rndseed {
     my ($safeeval)=@_;
     my $rndseed;
-    if ($ENV{'request.state'} eq "construct") {
+    my ($symb)=&Apache::lonxml::whichuser();
+    if ($ENV{'request.state'} eq "construct" || $symb eq '') {
 	$rndseed=$ENV{'form.rndseed'};
 	if (!$rndseed) {
+	    $rndseed=$Apache::lonhomework::history{'rndseed'};
+	    if (!$rndseed) {
+		$rndseed=time;
+		$ENV{'form.rndseed'}=$rndseed;
+	    }
+	}
+	if ($ENV{'form.resetdata'} eq 'New Problem Variation') {
 	    $rndseed=time;
 	    $ENV{'form.rndseed'}=$rndseed;
 	}
@@ -186,8 +194,9 @@ sub problem_web_to_edit_header {
 
 sub initialize_storage {
     %Apache::lonhomework::results=();
+    %Apache::lonhomework::history=();
     my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
-    if ($ENV{'request.state'} eq 'construct') {
+    if ($ENV{'request.state'} eq 'construct' || $symb eq '') {
 	%Apache::lonhomework::history=
 	    &Apache::lonnet::tmprestore($ENV{'request.uri'},'',$domain,$name);
 	my ($temp)=keys %Apache::lonhomework::history ;
@@ -210,7 +219,8 @@ sub finalize_storage {
     my ($temp) = keys %Apache::lonhomework::results;
     if ( $temp ne '' ) {
 	my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
-	if ($ENV{'request.state'} eq 'construct') {
+	if ($ENV{'request.state'} eq 'construct' || $symb eq '') {
+	    $Apache::lonhomework::results{'rndseed'}=$ENV{'form.rndseed'};
 	    $result=&Apache::lonnet::tmpstore(\%Apache::lonhomework::results,
 					$ENV{'request.uri'},'',$domain,$name);
 	    &Apache::lonxml::debug('Construct Store return message:'.$result);
@@ -251,12 +261,16 @@ sub start_problem {
 	my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);
 	return '';
     }
-#intialize globals
+#initialize globals
     $Apache::inputtags::part='0';
     @Apache::inputtags::responselist = ();
     @Apache::inputtags::previous=();
     @Apache::inputtags::previous_version=();
     $Apache::structuretags::printanswer='No';
+    @Apache::structuretags::whileconds=();
+    @Apache::structuretags::whilebody=();
+    @Apache::structuretags::whileline=();
+
     if ($target ne 'analyze') {
 	&initialize_storage();
 	if ($target eq 'web') {
@@ -304,6 +318,13 @@ sub start_problem {
 
 	#handle rand seed in construction space
 	my $rndseed=&setup_rndseed($safeeval);
+	my ($symb)=&Apache::lonxml::whichuser();
+	if ($ENV{'request.state'} ne "construct" || $symb eq '') {
+	    $form_tag_start.='<input type="hidden" name="rndseed" value="'.
+		$rndseed.'" />'.
+		    '<input type="submit" name="resetdata"
+                             value="New Problem Variation" />';
+	}
 	($status,$accessmsg) = &Apache::lonhomework::check_access('0');
 	push (@Apache::inputtags::status,$status);
 	my $expression='$external::datestatus="'.$status.'";';
@@ -582,9 +603,8 @@ sub end_block {
 sub start_while {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
 
-    &Apache::lonxml::debug('starting while');
     my $result;
-    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || 
+    if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
 	$target eq 'tex' || $target eq 'analyze') {
 	my $code = $token->[2]->{'condition'};
 
@@ -593,8 +613,10 @@ sub start_while {
 	    &Apache::lonxml::default_homework_load($safeeval);
 	}
 	my $result = &Apache::run::run($code,$safeeval);
-	my $bodytext=$$parser[-1]->get_text("/while");
+	my $bodytext=&Apache::lonxml::get_all_text("/while",$parser);
 	push( @Apache::structuretags::whilebody, $bodytext);
+	push( @Apache::structuretags::whileline, $token->[5]);
+	&Apache::lonxml::debug("s code $code got -$result-");
 	if ( $result ) {
 	    &Apache::lonxml::newparser($parser,\$bodytext);
 	}
@@ -613,17 +635,26 @@ sub start_while {
 
 sub end_while {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-    &Apache::lonxml::debug('ending while');
-
     my $result;
 
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
 	$target eq 'tex' || $target eq 'analyze') {
 	my $code = pop(@Apache::structuretags::whileconds);
 	my $bodytext = pop(@Apache::structuretags::whilebody);
-	my $result = &Apache::run::run($code,$safeeval);
-	if ( $result ) {
-	    &Apache::lonxml::newparser($parser,\$bodytext);
+	my $line = pop(@Apache::structuretags::whileline);
+	my $return = &Apache::run::run($code,$safeeval);
+	my $starttime=time;
+	my $error=0;
+	while ($return) {
+	    if (time-$starttime >
+		$Apache::lonnet::perlvar{'lonScriptTimeout'}) {
+		$return = 0; $error=1; next;
+	    }
+	    $result.=&Apache::scripttag::xmlparse($bodytext);
+	    $return = &Apache::run::run($code,$safeeval);
+	}
+	if ($error) {
+	    &Apache::lonxml::error('<pre>Code ran too long. It ran for more than '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' seconds occured while running &lt;while$gt; on line '.$line.'</pre>');
 	}
     } elsif ($target eq "edit") {
 	$result.= &Apache::edit::tag_end($target,$token,'');