--- loncom/homework/structuretags.pm 2002/11/22 19:46:36 1.138 +++ loncom/homework/structuretags.pm 2003/02/25 23:18:22 1.150 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.138 2002/11/22 19:46:36 albertel Exp $ +# $Id: structuretags.pm,v 1.150 2003/02/25 23:18:22 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -35,6 +35,7 @@ package Apache::structuretags; use strict; use Apache::lonnet; use Apache::File(); +use Apache::lonmenu; BEGIN { &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext')); @@ -43,7 +44,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 +57,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.' '; } @@ -81,12 +82,12 @@ sub page_start { if (!defined($found{'html'})) { $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack, $parser,$safeeval); - $head_tag_start='
'.&Apache::lonxml::registerurl(undef,$target); + $head_tag_start=''.&Apache::lonmenu::registerurl(undef,$target); } my $body_tag_start; if (!defined($found{'body'})) { - $body_tag_start=''; + $body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target); if ($target eq 'web' && $ENV{'request.state'} ne 'construct') { my ($symb)=&Apache::lonxml::whichuser(); if ($symb eq '') { @@ -118,11 +119,10 @@ sub page_start { return ($result,$head_tag_start,$body_tag_start,$form_tag_start); } -use Time::HiRes(); +#use Time::HiRes(); 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 +246,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 +305,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. - '