--- loncom/homework/structuretags.pm 2003/02/27 20:01:05 1.151 +++ loncom/homework/structuretags.pm 2003/03/14 23:23:45 1.156 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.151 2003/02/27 20:01:05 sakharuk Exp $ +# $Id: structuretags.pm,v 1.156 2003/03/14 23:23:45 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -101,7 +101,7 @@ sub page_start { $body_tag_start.='bgcolor="#ffffff"'; } } - $body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target); + $body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1); if ($target eq 'web' && $ENV{'request.state'} ne 'construct') { my ($symb)=&Apache::lonxml::whichuser(); if ($symb eq '') { @@ -241,6 +241,7 @@ ENDCHECKOUT sub start_problem { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + $Apache::lonhomework::parsing_a_problem=1; # meta is called from lonpublisher, which doesn't uses the normal # lonhomework method of parsing the file which means that inputtags # won't get reset @@ -253,6 +254,7 @@ sub start_problem { $Apache::inputtags::part='0'; @Apache::inputtags::responselist = (); @Apache::inputtags::previous=(); + @Apache::inputtags::previous_version=(); $Apache::structuretags::printanswer='No'; if ($target ne 'analyze') { &initialize_storage(); @@ -382,14 +384,15 @@ sub start_problem { my @due_file_content = <$temp_file>; my $due_file_content = $due_file_content[$#due_file_content]; chomp $due_file_content; + my $name_of_resourse= &get_resource_name($parstack,$safeeval); if ($due_file_content ne $duedate) { $temp_file = Apache::File->new('>'.$filename); print $temp_file "$duedate\n"; if (not $ENV{'request.symb'} =~ m/\.page_/) { if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') { - $result .= '\begin{document} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent \begin{minipage}{\textwidth}'; + $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource

"'.$name_of_resourse.'"

located in
'.$ENV{'request.uri'}.'
STAMPOFPASSEDRESOURCEEND} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent \begin{minipage}{\textwidth}'; } else { - $result .= '\begin{document} \noindent \vskip 1 mm \noindent\begin{minipage}{\textwidth}'; + $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource

"'.$name_of_resourse.'"

located in
'.$ENV{'request.uri'}.'
STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm \noindent\begin{minipage}{\textwidth}'; if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $result .= '\fbox{\textit{'.$weight.' pt}}';} } } else { @@ -397,7 +400,7 @@ sub start_problem { } } else { if (not $ENV{'request.symb'} =~ m/\.page_/) { - $result .= '\begin{document} \noindent \vskip 1 mm\noindent\begin{minipage}{\textwidth}'; + $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource

"'.$name_of_resourse.'"

located in
'.$ENV{'request.uri'}.'
STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm\noindent\begin{minipage}{\textwidth}'; if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $result .= '\fbox{\textit{'.$weight.' pt}}';} } else { $result .= '\vskip 1mm \\\\\\\\'; @@ -475,6 +478,12 @@ sub end_problem { &Apache::lonxml::debug("in end_problem with $target, edit"); $result = &problem_edit_footer(); } + + undef(%Apache::lonhomework::history); + undef(%Apache::lonhomework::results); + undef($Apache::inputtags::part); + undef($Apache::lonhomework::parsing_a_problem); + return $result; } @@ -678,6 +687,7 @@ sub start_part { $Apache::inputtags::part=$id; @Apache::inputtags::responselist = (); @Apache::inputtags::previous=(); + @Apache::inputtags::previous_version=(); my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part); if ($target eq 'meta') { @@ -741,6 +751,7 @@ sub end_part { $result=$gradestatus; } pop @Apache::inputtags::status; + $Apache::inputtags::part=''; return $result; }