--- loncom/homework/structuretags.pm	2002/11/10 15:39:37	1.134
+++ loncom/homework/structuretags.pm	2003/02/07 21:50:12	1.145
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.134 2002/11/10 15:39:37 albertel Exp $
+# $Id: structuretags.pm,v 1.145 2003/02/07 21:50:12 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -118,10 +118,11 @@ sub page_start {
   return ($result,$head_tag_start,$body_tag_start,$form_tag_start);
 }
 
+#use Time::HiRes();
 sub get_resource_name {
   my ($parstack,$safeeval)=@_;
-  my $name=&Apache::lonxml::get_param('name',$parstack,$safeeval);
-  if ($name eq '') { 
+  my $name=&Apache::lonnet::gettitle();
+  if ($name eq '') {
     $name=&Apache::lonnet::EXT('resource.title');
     if ($name eq 'con_lost') { $name = ''; }
   }
@@ -138,6 +139,7 @@ sub setup_rndseed {
       $rndseed=time;
       $ENV{'form.rndseed'}=$rndseed;
     }
+    &Apache::lonxml::debug("Setting rndseed to $rndseed");
     &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval);
   }
   return $rndseed;
@@ -149,13 +151,13 @@ sub problem_edit_header {
        <input type="submit" name="problemmode" value="Discard Edits and View" />
        <input type="submit" name="problemmode" value="EditXML" />
        <input type="submit" name="Undo" value="undo" /> <hr />
-       <input type="submit" name="submit" value="Submit Changes" />
-       <input type="submit" name="submit" value="Submit Changes and View" /><br /><p>&nbsp;</p>
+       <input type="submit" name="submit" value="Submit Changes and Edit" />
+       <input type="submit" name="submit" value="Submit Changes and View" /><br /><p>&nbsp;</p><table border="0"><tr><td bgcolor="#DDDDDD">
       ';
 }
 
 sub problem_edit_footer {
-  return '<br /><input type="submit" name="submit" value="Submit Changes and Edit" />
+  return '</td></tr></table><br /><input type="submit" name="submit" value="Submit Changes and Edit" />
     <input type="submit" name="submit" value="Submit Changes and View" />';
 }
 
@@ -174,10 +176,9 @@ sub problem_web_to_edit_header {
              <hr />';
   my $numtoanalyze=$ENV{'form.numtoanalyze'};
   if (!$numtoanalyze) { $numtoanalyze=100; }
-  #DISABLED for now.
-  #$result.= '<input type="submit" name="problemmode" value="Answer Distribution" />
-#             <input type="text" name="numtoanalyze" value="'.
-#		 $numtoanalyze.'" size="5" /> <hr />';
+  $result.= '<input type="submit" name="problemmode" value="Answer Distribution" />
+             <input type="text" name="numtoanalyze" value="'.
+	       $numtoanalyze.'" size="5" /> <hr />';
   return $result;
 }
 
@@ -281,6 +282,7 @@ sub start_problem {
     &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
   if ($target eq 'tex' and $ENV{'request.symb'} =~ m/\.page_/) { $result = '';}
 
+  if ($target eq 'analyze') { my $rndseed=&setup_rndseed($safeeval); }
   if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
     #handle exam checkout
     if ($Apache::lonhomework::type eq 'exam') {
@@ -302,12 +304,17 @@ sub start_problem {
     &Apache::lonxml::debug("Got $status");
     if (( $status eq 'CLOSED' ) ||
         ( $status eq 'UNCHECKEDOUT') ||
-        ( $status eq 'BANNED')) {
+        ( $status eq 'BANNED') ||
+        ( $status eq 'UNAVAILABLE')) {
       my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);
       if ( $target eq "web" ) {
 	$result.= $head_tag_start.'</head>';
-        my $msg=$body_tag_start.
-	    '<h1>Not open to be viewed</h1>';
+        my $msg=$body_tag_start;
+	if ($status eq 'UNAVAILABLE') {
+	    $result.='<h1>Unable to determine if this resource is open due to network problems. Please try again later.</h1>';
+	} else {
+	    $result.='<h1>Not open to be viewed</h1>';
+	}
         if ($status eq 'CLOSED') {
 	    $msg.='The problem '.$accessmsg;
 	} elsif ($status eq 'UNCHECKEDOUT') {
@@ -315,8 +322,13 @@ sub start_problem {
         }
 	$result.=$msg.'<br />';
       } elsif ($target eq 'tex') {
-	  $result.="\\begin{document}\\noindent \\vskip 1 mm \\begin{minipage}{\\textwidth}\\vskip 0 mm Problem is not open to be viewed. It $accessmsg \\vskip 0 mm ";
-      } 
+	  $result.="\\begin{document}\\noindent \\vskip 1 mm \\begin{minipage}{\\textwidth}\\vskip 0 mm ";
+	if ($status eq 'UNAVAILABLE') {
+	    $result.='Unable to determine if this resource is open due to network problems. Please try again later.\vskip 0 mm ';
+	} else {
+	    $result.="Problem is not open to be viewed. It $accessmsg \\vskip 0 mm ";
+	}
+      }
     } elsif ($target eq 'web') {
       my $name= &get_resource_name($parstack,$safeeval);
       if ($status eq 'CAN_ANSWER') {
@@ -335,7 +347,7 @@ sub start_problem {
 	  }
 	}
       } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER'
-	       || $status eq 'CLOSED') {
+	       || $status eq 'CLOSED' || $status eq 'UNAVALAILABLE') {
 	$result.=$head_tag_start.
 	  "<title>$name</title></head>\n$body_tag_start\n";
       }
@@ -399,7 +411,7 @@ sub end_problem {
   my $result='';
   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') {
+    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 ( ($target eq 'web' || $target eq 'tex') && $Apache::inputtags::part eq '0' && 
@@ -423,21 +435,25 @@ sub end_problem {
 	      $result.="</body>\n";
 	  }
       }
-      if ($target ne 'tex') {
+      if ($target eq 'web') {
 	  $result.=&Apache::lonxml::xmlend();
-      } else {
-	      $result .= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
-	      if (not $ENV{'request.symb'} =~ m/\.page_/) {
-		  $result .= '\end{minipage}\end{document} ';
-	      } else {
-		  $result .= '';
-	      }
+      } elsif ($target eq 'tex') {
+	  $result .= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
+	  if (not $ENV{'request.symb'} =~ m/\.page_/) {
+	      $result .= '\end{minipage}\end{document} ';
+	  } else {
+	      $result .= '';
+	  }
       }
     }
     if ($target eq 'grade') { 
       &Apache::lonhomework::showhash(%Apache::lonhomework::results);
       &finalize_storage();
     }
+    if ($target eq 'answer' && ($ENV{'request.state'} eq 'construct') ) {
+	$result.='</html>'; #normally we get it from xmlend, but in CSTR
+                            # we always show answer mode too.
+    }
   } elsif ($target eq 'meta') {
     if ($Apache::inputtags::part eq '0') {
       $result=&Apache::response::mandatory_part_meta;
@@ -445,7 +461,7 @@ sub end_problem {
   } elsif ($target eq 'edit') {
     &Apache::lonxml::debug("in end_problem with $target, edit");
     $result = &problem_edit_footer();
-  } 
+  }
   return $result;
 }
 
@@ -501,6 +517,9 @@ sub start_block {
 	if ($code) {
 	    $code =~ s/\"//g;
 	    $code .=';return $condition;';
+	    if (!$Apache::lonxml::default_homework_loaded) {
+		&Apache::lonxml::default_homework_load($safeeval);
+	    }
 	    $result = &Apache::run::run($code,$safeeval);
 	    &Apache::lonxml::debug("block :$code: returned :$result:");
 	} else {
@@ -536,6 +555,9 @@ sub start_while {
   $code .=';return $condition;';
 
   push( @Apache::structuretags::whileconds, $code); 
+  if (!$Apache::lonxml::default_homework_loaded) {
+      &Apache::lonxml::default_homework_load($safeeval);
+  }
   my $result = &Apache::run::run($code,$safeeval);
   my $bodytext=$$parser[$#$parser]->get_text("/while");
   push( @Apache::structuretags::whilebody, $bodytext);
@@ -686,17 +708,19 @@ sub end_part {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   &Apache::lonxml::debug("in end_part $target ");
   my $status=$Apache::inputtags::status['-1'];
-  pop @Apache::inputtags::status;
-  if ( $target eq 'meta' ) { return ''; }
-  if ( $target eq 'grade' && $status eq 'CAN_ANSWER') {
-    return &Apache::inputtags::grade;
-  }
-  if ($target eq 'web' || $target eq 'tex' ) {
-    my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part,$target);
+  my $result='';
+  if ( $target eq 'meta' ) {
+      $result='';
+  } elsif ( $target eq 'grade' && $status eq 'CAN_ANSWER') {
+    $result=&Apache::inputtags::grade;
+  } elsif ($target eq 'web' || $target eq 'tex' ) {
+    my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part,
+						    $target);
     if ($Apache::lonhomework::type eq 'exam') {$gradestatus='';}
-    return $gradestatus;
+    $result=$gradestatus;
   }
-  return '';
+  pop @Apache::inputtags::status;
+  return $result;
 }
 
 sub start_preduedate {