--- loncom/homework/structuretags.pm 2002/12/05 14:37:17 1.141 +++ loncom/homework/structuretags.pm 2002/12/05 23:26:24 1.143 @@ -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.143 2002/12/05 23:26:24 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -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 = ''; } @@ -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.''; - my $msg=$body_tag_start. - '

Not open to be viewed

'; + my $msg=$body_tag_start; + if ($status eq 'UNAVAILABLE') { + $result.='

Unable to determine if this resource is open due to network problems. Please try again later.

'; + } else { + $result.='

Not open to be viewed

'; + } if ($status eq 'CLOSED') { $msg.='The problem '.$accessmsg; } elsif ($status eq 'UNCHECKEDOUT') { @@ -318,8 +322,13 @@ sub start_problem { } $result.=$msg.'
'; } 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. "$name\n$body_tag_start\n"; } @@ -448,7 +457,7 @@ sub end_problem { } elsif ($target eq 'edit') { &Apache::lonxml::debug("in end_problem with $target, edit"); $result = &problem_edit_footer(); - } + } return $result; }