--- loncom/homework/structuretags.pm	2001/08/22 19:21:36	1.66
+++ loncom/homework/structuretags.pm	2001/12/04 14:53:59	1.73
@@ -66,8 +66,15 @@ sub page_start {
 sub initialize_storage {
   %Apache::lonhomework::results=();
   my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
-  %Apache::lonhomework::history=
-    &Apache::lonnet::restore($symb,$courseid,$domain,$name);
+  if ($ENV{'request.state'} eq 'construct') {
+    %Apache::lonhomework::history=
+      &Apache::lonnet::tmprestore($ENV{'request.uri'},'',$domain,$name);
+    my ($temp)=keys %Apache::lonhomework::history ;
+    &Apache::lonxml::debug("Return message of $temp");
+  } else {
+    %Apache::lonhomework::history=
+      &Apache::lonnet::restore($symb,$courseid,$domain,$name);
+  }
   #ignore error conditions
   my ($temp)=keys %Apache::lonhomework::history ;
   if ($temp =~ m/^error:.*/) { %Apache::lonhomework::history=(); }
@@ -82,9 +89,15 @@ sub finalize_storage {
   my ($temp) = keys %Apache::lonhomework::results;
   if ( $temp ne '' ) {
     my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
-    $result=&Apache::lonnet::cstore(\%Apache::lonhomework::results,
-				    $symb,$courseid,$domain,$name);
-    &Apache::lonxml::debug("Store return message:".$result);
+    if ($ENV{'request.state'} eq 'construct') {
+      $result=&Apache::lonnet::tmpstore(\%Apache::lonhomework::results,
+				      $ENV{'request.uri'},'',$domain,$name);
+      &Apache::lonxml::debug('Construct Store return message:'.$result);
+    } else {
+      $result=&Apache::lonnet::cstore(\%Apache::lonhomework::results,
+				      $symb,$courseid,$domain,$name);
+      &Apache::lonxml::debug('Store return message:'.$result);
+    }
   }
   return $result;
 }
@@ -114,6 +127,9 @@ sub start_problem {
   @Apache::inputtags::responselist = ();
   @Apache::inputtags::previous=();
   &initialize_storage();
+  if ($target eq 'web') {
+    &Apache::lonhomework::showhash(%Apache::lonhomework::history);
+  }
   $Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');
   &Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:");
   if ($Apache::lonhomework::type eq '') {
@@ -127,7 +143,7 @@ sub start_problem {
     }
   }
 
-#added vars to the scripting enviroment
+  #added vars to the scripting enviroment
   my $expression='$external::part='.$Apache::inputtags::part.';';
   &Apache::run::run($expression,$safeeval);
   my $status;
@@ -137,17 +153,28 @@ sub start_problem {
   my ($result,$head_tag_start,$body_tag_start)=
     &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
 
-  if ($Apache::lonhomework::type eq 'exam') {
-      if ($target eq 'web') {
-          my $token=$Apache::lonhomework::history{"resource.0.outtoken"};
-          if (($ENV{'form.doescheckout'}) && (!$token)) {
-	     $token=&Apache::lonxml::maketoken();
-             $Apache::lonhomework::history{"resource.0.outtoken"}=$token;
-          }
-          $body_tag_start.=&Apache::lonxml::printtokenheader($target,$token);
+
+  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
+    #handle exam checkout
+    if ($Apache::lonhomework::type eq 'exam') {
+      my $token=$Apache::lonhomework::history{"resource.0.outtoken"};
+      if (($ENV{'form.doescheckout'}) && (!$token)) {
+	$token=&Apache::lonxml::maketoken();
+	$Apache::lonhomework::history{"resource.0.outtoken"}=$token;
       }
-  }
-  if ($target eq 'web' || $target eq 'grade') {
+      $body_tag_start.=&Apache::lonxml::printtokenheader($target,$token);
+    }
+
+    #handle rand seed in construction space
+    my $rndseed;
+    if ($ENV{'request.state'} eq "construct") {
+      $rndseed=$ENV{'form.rndseed'};
+      if (!$rndseed) {
+	$rndseed=time;
+	$ENV{'form.rndseed'}=$rndseed;
+      }
+      &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval);
+    }
     ($status,$accessmsg) = &Apache::lonhomework::check_access('0');
     push (@Apache::inputtags::status,$status);
     my $expression='$external::datestatus="'.$status.'";';
@@ -166,75 +193,86 @@ sub start_problem {
 	} elsif ($status eq 'UNCHECKEDOUT') {
             $msg.=&checkout_msg;
         }
-	return $result.$msg.'<br />';
+	$result.=$msg.'<br />';
       }
-    }
-  }
-  if ($target eq 'web') {
-    my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
-    if ($name eq '') { 
-      $name=&Apache::lonnet::EXT('resource.title');
-      if ($name eq 'con_lost') { $name = ''; }
-    }
-    $Apache::lonhomework::name=$name;
-    if ($status eq 'CAN_ANSWER') {
-      # create a page header and exit
-      $result.="$head_tag_start<title>$name</title></head>\n
+    } elsif ($target eq 'web') {
+      my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval);
+      if ($name eq '') { 
+	$name=&Apache::lonnet::EXT('resource.title');
+	if ($name eq 'con_lost') { $name = ''; }
+      }
+      $Apache::lonhomework::name=$name;
+      if ($status eq 'CAN_ANSWER') {
+	# create a page header and exit
+	$result.="$head_tag_start<title>$name</title></head>\n
               $body_tag_start\n
               <form name=\"lonhomework\" method=\"POST\" action=\"".$ENV{'request.uri'}."\">".
 		'<input type="hidden" name="submitted" value="yes" />';
-      if ($ENV{'request.state'} eq "construct") {
-	$result.='<input type="hidden" name="problemmode" value="View" />
-                 <input type="submit" name="problemmode" value="Edit" /><hr />';
-      }
-      # if we are viewing someone else preserve that info
-      if (defined $ENV{'form.grade_symb'}) {
-	foreach my $field ('symb','courseid','domain','username') {
-	  $result .= '<input type="hidden" name="grade_'.$field.
-	    '" value="'.$ENV{"form.grade_$field"}.'" />'."\n";
+	if ($ENV{'request.state'} eq "construct") {
+	  $result.=
+	    '<input type="hidden" name="problemmode" value="View" />
+             <input type="submit" name="problemmode" value="Edit" />
+             <input type="submit" name="problemmode" value="EditXML" />
+             Random Seed:<input type="text" name="rndseed" width="10" value="'.
+	       $rndseed.'" />
+             <input type="submit" name="changerandseed" value="Change" />
+             <input type="submit" name="resetdata" value="Reset Submissions" />
+             <hr />';
+	}
+	# if we are viewing someone else preserve that info
+	if (defined $ENV{'form.grade_symb'}) {
+	  foreach my $field ('symb','courseid','domain','username') {
+	    $result .= '<input type="hidden" name="grade_'.$field.
+	      '" value="'.$ENV{"form.grade_$field"}.'" />'."\n";
+	  }
 	}
+      } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER'
+	       || $status eq 'CLOSED') {
+	$result.=$head_tag_start.
+	  "<title>$name</title></head>\n$body_tag_start\n";
       }
-      return $result;
-    } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' || $status eq 'CLOSED') {
-      return $result.$head_tag_start."<title>$name</title></head>\n$body_tag_start\n";
     }
-  }
-  if ($target eq 'edit') {
+  } elsif ($target eq 'edit') {
     $result.=$head_tag_start."</head>".$body_tag_start.
-      '<form name="lonhomework" method="POST" action="'.$ENV{'request.uri'}.'">
+      '<form name="lonhomework" method="POST" action="'.
+	$ENV{'request.uri'}.'">
        <input type="hidden" name="submitted" value="edit" />
        <input type="hidden" name="problemmode" value="Edit" />
        <input type="submit" name="problemmode" value="View" />
+       <input type="submit" name="problemmode" value="EditXML" />
        <input type="submit" name="Undo" value="undo" /> <hr />
        <input type="submit" name="submit" value="Submit Changes" /><br />
       ';
     my $temp=&Apache::edit::insertlist($target,$token);
     $result.=$temp;
-    return $result;
-  }
-  if ($target eq 'modified') {
+  } elsif ($target eq 'modified') {
     $result=$token->[4];
     $result.=&Apache::edit::handle_insert();
-    return $result;
+  } else {
+    # page_start returned a starting result, delete it if we don't need it
+    $result = '';
   }
-  return '';
+  return $result;
 }
 
 sub end_problem {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   my $result='';
   my $status=$Apache::inputtags::status['-1'];
-  if ($target eq 'grade' || $target eq 'web' ) {
+  if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ) {
     if ( $target eq 'grade' && $Apache::inputtags::part eq '0' &&
        $status eq 'CAN_ANSWER') {
       # if part is zero, no <part>s existed, so we need to the grading
       &Apache::inputtags::grade;
-    } elsif ($Apache::inputtags::part eq '0') {
+    } elsif ( $target eq 'web' && $Apache::inputtags::part eq '0') {
       # if part is zero, no <part>s existed, so we need show the current 
       # grading status
       $result.= &Apache::inputtags::gradestatus($Apache::inputtags::part);
     }
-    if ($target eq 'web') { 
+    if (
+	($target eq 'web' && ($ENV{'request.state'} ne 'construct')) ||
+	($target eq 'answer')
+       ) {
       if ($status eq 'CAN_ANSWER') {
 	$result.="</form></body>\n"; 
       } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {
@@ -293,7 +331,7 @@ sub end_library {
 sub start_block {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
 
-  if ($target eq 'web' || $target eq 'grade') {
+  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
     my $code = @$parstack[$#$parstack];
     $code =~ s/\"//g;
     $code .=';return $condition;';
@@ -348,49 +386,52 @@ sub end_while {
 # </randomlist>
 sub start_randomlist {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-  my $body= &Apache::lonxml::get_all_text("/randomlist",$$parser[$#$parser]);
-  my $b_parser= HTML::TokeParser->new(\$body);
-  my $b_tok;
-  my @randomlist;
-  my $list_item;
-
-  while($b_tok = $b_parser->get_token() ) {
-    if($b_tok->[0] eq 'S') { # start tag
-    # get content of the tag until matching end tag
-    # get all text upto the matching tag
-    # and push the content into @randomlist
-      $list_item = &Apache::lonxml::get_all_text('/'.$b_tok->[1],$b_parser);
-      $list_item = "$b_tok->[4]"."$list_item"."</$b_tok->[1]>";
-      push(@randomlist,$list_item);
-   #  print "<br /><b>START-TAG $b_tok->[1], $b_tok->[4], $list_item</b>";
-    }
-    if($b_tok->[0] eq 'T') { # text
-    # what to do with text in between tags?
-      #  print "<b>TEXT $b_tok->[1]</b><br />";
-    }
-    # if($b_tok->[0] eq 'E') { # end tag, should not happen
+  if ($target eq 'answer' || $target eq 'grade' || $target eq 'web') {
+    my $body= &Apache::lonxml::get_all_text("/randomlist",$$parser[$#$parser]);
+    my $b_parser= HTML::TokeParser->new(\$body);
+    my $b_tok;
+    my @randomlist;
+    my $list_item;
+    while($b_tok = $b_parser->get_token() ) {
+      if($b_tok->[0] eq 'S') { # start tag
+	# get content of the tag until matching end tag
+	# get all text upto the matching tag
+	# and push the content into @randomlist
+	$list_item = &Apache::lonxml::get_all_text('/'.$b_tok->[1],$b_parser);
+	$list_item = "$b_tok->[4]"."$list_item"."</$b_tok->[1]>";
+	push(@randomlist,$list_item);
+	#  print "<br /><b>START-TAG $b_tok->[1], $b_tok->[4], $list_item</b>";
+      }
+      if($b_tok->[0] eq 'T') { # text
+	# what to do with text in between tags?
+	#  print "<b>TEXT $b_tok->[1]</b><br />";
+      }
+      # if($b_tok->[0] eq 'E') { # end tag, should not happen
       #  print "<b>END-TAG $b_tok->[1]</b><br />";
-    # }
-  }
-  my @idx_arr = (0 .. $#randomlist);
-  &Apache::structuretags::shuffle(\@idx_arr);
-  my $bodytext = '';
-  for(0 .. $#randomlist) {
-    $bodytext .= "$randomlist[ $idx_arr[$_] ]";
-  }
+      # }
+    }
 
-  &Apache::lonxml::newparser($parser,\$bodytext);
+    my @idx_arr = (0 .. $#randomlist);
+    &Apache::structuretags::shuffle(\@idx_arr);
+    my $bodytext = '';
+    for(0 .. $#randomlist) {
+      $bodytext .= "$randomlist[ $idx_arr[$_] ]";
+    }
+    &Apache::lonxml::newparser($parser,\$bodytext);
+  }
   return "";
 }
 
 sub shuffle {
     my $a=shift;
     my $i;
-    &Apache::response::setrandomnumber();
-    for($i=@$a;--$i;) {
-      my $j=int rand($i+1);
-      next if $i == $j;
-      @$a[$i,$j] = @$a[$j,$i];
+    if (defined(@$a)) {
+      &Apache::response::setrandomnumber();
+      for($i=@$a;--$i;) {
+	my $j=int rand($i+1);
+	next if $i == $j;
+	@$a[$i,$j] = @$a[$j,$i];
+      }
     }
 }
 
@@ -407,7 +448,7 @@ sub start_part {
   @Apache::inputtags::previous=();
   if ($target eq 'meta') {
     return &Apache::response::mandatory_part_meta;
-  } elsif ($target eq 'web' || $target eq 'grade') {
+  } elsif ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
     my ($status,$accessmsg) = &Apache::lonhomework::check_access($id);
     push (@Apache::inputtags::status,$status);
     my $expression='$external::datestatus="'.$status.'";';
@@ -440,7 +481,7 @@ sub end_part {
 
 sub start_preduedate {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-  if ($target eq 'web' || $target eq 'grade') {
+  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
     if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
 	$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' ) {
       &Apache::lonxml::get_all_text("/preduedate",$$parser[$#$parser]);
@@ -469,7 +510,7 @@ sub end_postanswerdate {
 
 sub start_notsolved {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-  if ($target eq 'web' || $target eq 'grade') {
+  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
     my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
     &Apache::lonxml::debug("not solved has :$gradestatus:");
     if ($gradestatus =~ /^correct/) {
@@ -486,7 +527,7 @@ sub end_notsolved {
 
 sub start_solved {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-  if ($target eq 'web' || $target eq 'grade') {
+  if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') {
     my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
     if ($gradestatus !~ /^correct/) {
       &Apache::lonxml::get_all_text("/solved",$$parser[$#$parser]);
@@ -511,7 +552,7 @@ sub end_startouttext {
   my $text='';
 
   if ($target eq 'edit') {
-    $text=&Apache::lonxml::get_all_text("endouttext",$$parser[$#$parser]);
+    $text=&Apache::lonxml::get_all_text("endouttext",$$parser[-1]);
     $result.=&Apache::edit::start_table($token)."<tr><td>Text Block</td>
 <td>Delete:".
   &Apache::edit::deletelist($target,$token)
@@ -545,13 +586,13 @@ sub delete_startouttext {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
 #  my $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']);
   my $text=$$parser['-1']->get_text("/endouttext");
-  my $token=$$parser['-1']->get_token();
-  &Apache::lonxml::debug("Deleting :$text: and :$token->[0]:$token->[1]:$token->[2]: for startouttext");
-  &Apache::lonxml::end_tag($tagstack,$parstack,$token);
+  my $ntoken=$$parser['-1']->get_token();
+  &Apache::lonxml::debug("Deleting :$text: and :$ntoken->[0]:$ntoken->[1]:$ntoken->[2]: for startouttext");
+  &Apache::lonxml::end_tag($tagstack,$parstack,$ntoken);
   # Deleting 2 parallel tag pairs, but we need the numbers later to look like 
   # they did the last time round
-  &Apache::lonxml::increasedepth($token);
-  &Apache::lonxml::decreasedepth($token);
+  &Apache::lonxml::increasedepth($ntoken);
+  &Apache::lonxml::decreasedepth($ntoken);
   return 1;
 }