--- loncom/homework/structuretags.pm	2004/07/27 23:35:33	1.261
+++ loncom/homework/structuretags.pm	2004/09/09 08:59:56	1.267
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA 
 # definition of tags that give a structure to a document
 #
-# $Id: structuretags.pm,v 1.261 2004/07/27 23:35:33 www Exp $
+# $Id: structuretags.pm,v 1.267 2004/09/09 08:59:56 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,7 +36,7 @@ use Apache::File();
 use Apache::lonmenu;
 use Apache::lonlocal;
 use Apache::lonxml;
-
+use Time::HiRes qw( gettimeofday tv_interval );
 BEGIN {
     &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startouttext','endouttext','simpleeditbutton','definetag'));
 }
@@ -354,12 +354,13 @@ sub init_problem_globals {
     if ($type eq 'problem') {
 	$Apache::inputtags::part='0';
 	@Apache::inputtags::partlist=('0');
-
-	$Apache::lonhomework::problemstatus=&get_problem_status('0')
-    } else {
+	$Apache::lonhomework::problemstatus=&get_problem_status('0');
+	$Apache::lonhomework::ignore_response_errors=0;
+    } elsif ($type eq 'library') {
 	$Apache::inputtags::part='';
 	@Apache::inputtags::partlist=();
 	$Apache::lonhomework::problemstatus='';	
+	$Apache::lonhomework::ignore_response_errors=1;
     }
     @Apache::inputtags::responselist = ();
     @Apache::inputtags::importlist = ();
@@ -395,12 +396,14 @@ sub set_problem_state {
 
 sub get_problem_status {
     my ($part)=@_;
-    my $problem_status=&Apache::lonnet::EXT("resource.$part.problemstatus");
-    &Apache::lonxml::debug("problem status for $part is $problem_status");
-    &Apache::lonxml::debug("env probstat is ".$ENV{'form.problemstatus'});
+    my $problem_status;
     if ($ENV{'request.state'} eq 'construct' &&
 	defined($ENV{'form.problemstatus'})) {
 	$problem_status=$ENV{'form.problemstatus'};
+    } else {
+	$problem_status=&Apache::lonnet::EXT("resource.$part.problemstatus");
+	&Apache::lonxml::debug("problem status for $part is $problem_status");
+	&Apache::lonxml::debug("env probstat is ".$ENV{'form.problemstatus'});
     }
     return $problem_status;
 }
@@ -484,7 +487,16 @@ sub start_problem {
 		    '<input type="submit" name="resetdata"
                              value="'.&mt('New Problem Variation').'" />'.
 		    '<input type="hidden" name="username"
-                             value="'.$ENV{'form.username'}.'" /> <br />';
+                             value="'.$ENV{'form.username'}.'" />';
+	    if ($ENV{'user.adv'}) {
+		$form_tag_start.=
+		    ' <input type="checkbox" name="showallfoils" ';
+		if (defined($ENV{'form.showallfoils'})) {
+		    $form_tag_start.='checked="on"';
+		}
+		$form_tag_start.= ' />'.&mt('&nbsp;Show&nbsp;All&nbsp;Foils');
+	    }
+	    $form_tag_start.='<hr />';
 	}
 	($status,$accessmsg) = &Apache::lonhomework::check_access('0');
 	push (@Apache::inputtags::status,$status);
@@ -646,14 +658,15 @@ sub end_problem {
 		    $endminipage = '\end{minipage}';
 		}
                 if ($ENV{'form.print_discussions'} eq 'yes') {
-		    $result.=&Apache::lonxml::xmlend();
+		    $result.=&Apache::lonxml::xmlend($target,$parser);
 		    $result=~s/<\/html>//;
-		}
-		$result .= '\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
-		if (not $ENV{'request.symb'} =~ m/\.page_/) {
-		    $result .= $endminipage.'\end{document} ';
 		} else {
-		    $result .= '';
+		    $result .= '\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
+		    if (not $ENV{'request.symb'} =~ m/\.page_/) {
+			$result .= $endminipage.'\end{document} ';
+		    } else {
+			$result .= '';
+		    }
 		}
 	    }
 	}
@@ -1084,7 +1097,11 @@ sub start_part {
 	    } else {
 		if ($target eq 'tex') {
 		    if (not $ENV{'form.problem_split'}=~/yes/) {
-			$result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';
+			if ($$tagstack[-2] eq 'td') {
+			    $result.='\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';
+			} else {
+			    $result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';
+			}
 		    }
 		    my $weight = &Apache::lonnet::EXT("resource.$id.weight");
 		    my $allkeys=&Apache::lonnet::metadata($ENV{'request.uri'},'packages');
@@ -1144,6 +1161,7 @@ sub end_part {
 	    $gradestatus='';
 	}
 	$result=$gradestatus;
+	if ($$tagstack[-2] eq 'td' and $target eq 'tex') {$result.='\end{minipage}';} 
     } elsif ($target eq 'edit') {
 	$result=&Apache::edit::end_table();
     }