[LON-CAPA-cvs] cvs: loncom(version_1_0_1) /homework structuretags.pm

[albertel]

albertel		Wed Oct 15 18:24:08 2003 EDT

  Modified files:              (Branch: version_1_0_1)
    /loncom/homework	structuretags.pm 
  Log:
  - backport 1.216, and remove accidental earlier commit
  
  
Index: loncom/homework/structuretags.pm
diff -u loncom/homework/structuretags.pm:1.200.2.3 loncom/homework/structuretags.pm:1.200.2.4
--- loncom/homework/structuretags.pm:1.200.2.3	Mon Oct  6 17:57:53 2003
+++ loncom/homework/structuretags.pm	Wed Oct 15 18:24:06 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.200.2.3 2003/10/06 21:57:53 albertel Exp $
+# $Id: structuretags.pm,v 1.200.2.4 2003/10/15 22:24:06 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -363,7 +363,8 @@
 	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>';
@@ -373,7 +374,7 @@
 		} 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;
@@ -405,7 +406,8 @@
 		    }
 		}
 	    } 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";
 	    }
@@ -508,7 +510,7 @@
 		    $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";
@@ -543,7 +545,6 @@
 	    @Apache::inputtags::response=();
 	    $result=&Apache::response::mandatory_part_meta;
 	}
-	$result.=&Apache::response::meta_part_order;
     } elsif ($target eq 'edit') {
 	&Apache::lonxml::debug("in end_problem with $target, edit");
 	$result = &problem_edit_footer();
@@ -926,7 +927,11 @@
 	    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 />";