--- loncom/homework/structuretags.pm	2003/07/25 10:44:36	1.199
+++ loncom/homework/structuretags.pm	2003/10/15 22:24:06	1.200.2.4
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.199 2003/07/25 10:44:36 www Exp $
+# $Id: structuretags.pm,v 1.200.2.4 2003/10/15 22:24:06 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -44,9 +44,9 @@ BEGIN {
 
 sub start_web {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-    if (!($target eq 'web' || $target eq 'edit' || $target eq 'modified' ||
-	  $target eq 'answer' || $target eq 'grade' || $target eq 'meta' )) {
-	my $bodytext=&Apache::lonxml::get_all_text("/web",$parser);
+    my $bodytext=&Apache::lonxml::get_all_text("/web",$parser);
+    if ($target eq 'web') {
+	return $bodytext;
     }
     return '';
 }
@@ -58,12 +58,9 @@ sub end_web {
 sub start_tex {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result='';
-    if (!($target eq 'edit' || $target eq 'modified' ||
-	  $target eq 'answer' || $target eq 'grade' || $target eq 'meta' )) {
-	&Apache::lonxml::debug("tex 1");
-	my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser);
-    } elsif ($target eq 'tex') {
-	$result=&Apache::lonxml::get_all_text("/tex",$parser);
+    my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser);
+    if ($target eq 'tex') {
+	return $bodytext.' ';
     }
     return $result;;
 }
@@ -75,7 +72,7 @@ sub end_tex {
 sub page_start {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my %found;
-    foreach my $taginside ($tagstack) {
+    foreach my $taginside (@$tagstack) {
 	foreach my $taglookedfor ('html','body','form') {
 	    if ($taginside =~ /^$taglookedfor$/i) {$found{$taglookedfor} = 1;}
 	}
@@ -366,7 +363,8 @@ sub start_problem {
 	if (( $status eq 'CLOSED' ) ||
 	    ( $status eq 'UNCHECKEDOUT') ||
 	    ( $status eq 'BANNED') ||
-	    ( $status eq 'UNAVAILABLE')) {
+	    ( $status eq 'UNAVAILABLE') ||
+	    ( $status eq 'INVALID_ACCESS')) {
 	    my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);
 	    if ( $target eq "web" ) {
 		$result.= $head_tag_start.'</head>';
@@ -376,7 +374,7 @@ sub start_problem {
 		} else {
 		    $result.='<h1>Not open to be viewed</h1>';
 		}
-		if ($status eq 'CLOSED') {
+		if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') {
 		    $msg.='The problem '.$accessmsg;
 		} elsif ($status eq 'UNCHECKEDOUT') {
 		    $msg.=&checkout_msg;
@@ -408,7 +406,8 @@ sub start_problem {
 		    }
 		}
 	    } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER'
-		     || $status eq 'CLOSED' || $status eq 'UNAVALAILABLE') {
+		     || $status eq 'CLOSED' || $status eq 'UNAVALAILABLE' ||
+		     $status eq 'INVALID_ACCESS') {
 		$result.=$head_tag_start.
 		    "<title>$name</title></head>\n$body_tag_start\n";
 	    }
@@ -511,7 +510,7 @@ sub end_problem {
 		    $result.="</form></body>\n";
 		}
 	    } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' ||
-		     $status eq 'UNCHECKEDOUT' ) {
+		    $status eq 'UNCHECKEDOUT' || $status eq 'INVALID_ACCESS') {
 		if ($target ne 'tex' &&
 		    $ENV{'form.answer_output_mode'} ne 'tex') {
 		    $result.="</body>\n";
@@ -928,7 +927,11 @@ sub start_part {
 	    my $expression='$external::datestatus="'.$status.'";';
 	    $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.solved"}.'";';
 	    &Apache::run::run($expression,$safeeval);
-	    if ( $status eq 'CLOSED' ) {
+	    if (( $status eq 'CLOSED' ) ||
+		( $status eq 'UNCHECKEDOUT') ||
+		( $status eq 'BANNED') ||
+		( $status eq 'UNAVAILABLE') ||
+		( $status eq 'INVALID_ACCESS')) {
 		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 />";
@@ -978,7 +981,9 @@ sub end_part {
     } elsif (($target eq 'web' || $target eq 'tex') && !$hidden ) {
 	my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part,
 							$target);
-	if ($Apache::lonhomework::type eq 'exam') {$gradestatus='';}
+	if ($Apache::lonhomework::type eq 'exam' && $target eq 'tex') {
+	    $gradestatus='';
+	}
 	$result=$gradestatus;
     } elsif ($target eq 'edit') {
 	$result=&Apache::edit::end_table();