--- loncom/homework/structuretags.pm	2002/12/05 14:37:17	1.141
+++ loncom/homework/structuretags.pm	2003/02/07 22:03:21	1.146
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.141 2002/12/05 14:37:17 matthew Exp $
+# $Id: structuretags.pm,v 1.146 2003/02/07 22:03:21 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -43,7 +43,7 @@ BEGIN {
 
 sub start_web {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-  my $bodytext=&Apache::lonxml::get_all_text("/web",$$parser[$#$parser]);
+  my $bodytext=&Apache::lonxml::get_all_text("/web",$parser);
   if ($target eq 'web') {
     return $bodytext;
   } 
@@ -56,7 +56,7 @@ sub end_web {
 
 sub start_tex {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-  my $bodytext=&Apache::lonxml::get_all_text("/tex",$$parser[$#$parser]);
+  my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser);
   if ($target eq 'tex') {
       return $bodytext.' ';
   }
@@ -122,7 +122,6 @@ sub page_start {
 sub get_resource_name {
   my ($parstack,$safeeval)=@_;
   my $name=&Apache::lonnet::gettitle();
-  &Apache::lonnet::logthis("Got $name");
   if ($name eq '') {
     $name=&Apache::lonnet::EXT('resource.title');
     if ($name eq 'con_lost') { $name = ''; }
@@ -246,7 +245,7 @@ sub start_problem {
   # won't get reset
   if ( $Apache::inputtags::part ne '' && $target != 'meta' ) {
     &Apache::lonxml::error('Only one problem allowed in a .problem file');
-    my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[-1]);
+    my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);
     return '';
   }
 #intialize globals
@@ -305,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') {
@@ -318,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') {
@@ -338,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";
       }
@@ -402,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' && 
@@ -441,6 +450,10 @@ sub end_problem {
       &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;
@@ -448,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;
 }
 
@@ -513,7 +526,7 @@ sub start_block {
 	    $result='1';
 	}
 	if ( ! $result ) {
-	    my $skip=&Apache::lonxml::get_all_text("/block",$$parser[-1]);
+	    my $skip=&Apache::lonxml::get_all_text("/block",$parser);
 	    &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");
 	}
 	$result='';
@@ -576,7 +589,7 @@ sub start_randomlist {
   my $result;
   if ($target eq 'answer' || $target eq 'grade' || $target eq 'web' ||
       $target eq 'tex' || $target eq 'analyze') {
-    my $body= &Apache::lonxml::get_all_text("/randomlist",$$parser[$#$parser]);
+    my $body= &Apache::lonxml::get_all_text("/randomlist",$parser);
     my $b_parser= HTML::TokeParser->new(\$body);
     my $b_tok;
     my @randomlist;
@@ -661,7 +674,7 @@ sub start_part {
     $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.solved"}.'";';
     &Apache::run::run($expression,$safeeval);
     if ( $status eq 'CLOSED' ) {
-      my $bodytext=&Apache::lonxml::get_all_text("/part",$$parser[$#$parser]);
+      my $bodytext=&Apache::lonxml::get_all_text("/part",$parser);
       if ( $target eq "web" ) {
 	$result="<br />Part is not open to be viewed. It $accessmsg<br />";
       } elsif ( $target eq 'tex' ) {
@@ -716,7 +729,7 @@ sub start_preduedate {
     if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
 	$Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' && 
         $Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {
-      &Apache::lonxml::get_all_text("/preduedate",$$parser[$#$parser]);
+      &Apache::lonxml::get_all_text("/preduedate",$parser);
     }
   }
   return '';
@@ -730,7 +743,7 @@ sub start_postanswerdate {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   if ($target eq 'web' || $target eq 'grade' || $target eq 'tex') {
     if ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {
-      &Apache::lonxml::get_all_text("/postanswerdate",$$parser[$#$parser]);
+      &Apache::lonxml::get_all_text("/postanswerdate",$parser);
     }
   } elsif ($target eq 'tex') {
       return '\vskip 0 mm \noindent';
@@ -749,7 +762,7 @@ sub start_notsolved {
     &Apache::lonxml::debug("not solved has :$gradestatus:");
     if ($gradestatus =~ /^correct/) {
       &Apache::lonxml::debug("skipping");
-      &Apache::lonxml::get_all_text("/notsolved",$$parser[$#$parser]);
+      &Apache::lonxml::get_all_text("/notsolved",$parser);
     }
   }
   return '';
@@ -764,7 +777,7 @@ sub start_solved {
   if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {
     my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
     if ($gradestatus !~ /^correct/) {
-      &Apache::lonxml::get_all_text("/solved",$$parser[$#$parser]);
+      &Apache::lonxml::get_all_text("/solved",$parser);
     }
   }
   return '';
@@ -786,7 +799,7 @@ sub end_startouttext {
   my $text='';
 
   if ($target eq 'edit') {
-    $text=&Apache::lonxml::get_all_text("endouttext",$$parser[-1]);
+    $text=&Apache::lonxml::get_all_text("endouttext",$parser);
     $result.=&Apache::edit::start_table($token)."<tr><td>Text Block</td>
 <td>Delete:".
   &Apache::edit::deletelist($target,$token)
@@ -797,7 +810,7 @@ sub end_startouttext {
       &Apache::edit::editfield($token->[1],$text,"",80,4);
   }
   if ($target eq 'modified') {
-    $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']);
+    $text=&Apache::lonxml::get_all_text("endouttext",$parser);
     $result='<startouttext />'.&Apache::edit::modifiedfield();
   }
   if ($target eq 'tex') {
@@ -822,7 +835,7 @@ sub end_endouttext {
 }
 sub delete_startouttext {
   my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-#  my $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']);
+#  my $text=&Apache::lonxml::get_all_text("endouttext",$parser);
   my $text=$$parser['-1']->get_text("/endouttext");
   my $ntoken=$$parser['-1']->get_token();
   &Apache::lonxml::debug("Deleting :$text: and :$ntoken->[0]:$ntoken->[1]:$ntoken->[2]: for startouttext");