--- loncom/homework/structuretags.pm 2002/03/01 00:23:04 1.83 +++ loncom/homework/structuretags.pm 2002/04/10 19:58:19 1.89 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.83 2002/03/01 00:23:04 albertel Exp $ +# $Id: structuretags.pm,v 1.89 2002/04/10 19:58:19 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -79,7 +79,7 @@ sub page_start { if (!defined($found{'html'})) { $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack, $parser,$safeeval); - $head_tag_start='
'.&Apache::lonxml::registerurl(); + $head_tag_start=''.&Apache::lonxml::registerurl(undef,$target); } my $body_tag_start; if (!defined($found{'body'})) { @@ -174,12 +174,14 @@ sub start_problem { $Apache::inputtags::part='0'; @Apache::inputtags::responselist = (); @Apache::inputtags::previous=(); - &initialize_storage(); - if ($target eq 'web') { - &Apache::lonhomework::showhash(%Apache::lonhomework::history); + if ($target ne 'analyze') { + &initialize_storage(); + if ($target eq 'web') { + &Apache::lonhomework::showhash(%Apache::lonhomework::history); + } + $Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type'); + &Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:"); } - $Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type'); - &Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:"); if ($Apache::lonhomework::type eq '') { my $uri=$ENV{'request.uri'}; if ($uri=~/\.(\w+)$/) { @@ -297,7 +299,7 @@ sub start_problem { $result=$token->[4]; $result.=&Apache::edit::handle_insert(); } elsif ($target eq 'tex') { - $result .= '\begin{document}\noindent\textbf{Problem.}\newline'; + $result .= '\begin{document} '; } else { # page_start returned a starting result, delete it if we don't need it $result = ''; @@ -336,12 +338,19 @@ sub end_problem { } elsif ($target eq 'meta') { if ($Apache::inputtags::part eq '0') { $result=&Apache::response::mandatory_part_meta; + } else { + # there were intervening parts need to set the global temporarily + # and only need the package reference + my $temp=$Apache::inputtags::part; + $Apache::inputtags::part=0; + $result=&Apache::response::meta_package_write('part'); + $Apache::inputtags::part=$temp; } } elsif ($target eq 'edit') { &Apache::lonxml::debug("in end_problem with $target, edit"); $result='