[LON-CAPA-cvs] cvs: loncom /homework structuretags.pm

sakharuk lon-capa-cvs@mail.lon-capa.org
Tue, 10 Aug 2004 18:04:22 -0000


sakharuk		Tue Aug 10 14:04:22 2004 EDT

  Modified files:              
    /loncom/homework	structuretags.pm 
  Log:
  Bug 2838 (print attached discussions too) is fixed. See logs for lonfeedback.pm and lomxml.pm.
  
  
Index: loncom/homework/structuretags.pm
diff -u loncom/homework/structuretags.pm:1.261 loncom/homework/structuretags.pm:1.262
--- loncom/homework/structuretags.pm:1.261	Tue Jul 27 19:35:33 2004
+++ loncom/homework/structuretags.pm	Tue Aug 10 14:04:22 2004
@@ -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.262 2004/08/10 18:04:22 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -646,14 +646,15 @@
 		    $endminipage = '\end{minipage}';
 		}
                 if ($ENV{'form.print_discussions'} eq 'yes') {
-		    $result.=&Apache::lonxml::xmlend();
+		    $result.=&Apache::lonxml::xmlend($target,$tagstack,$parstack,$parser,$safeeval);
 		    $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 .= '';
+		    }
 		}
 	    }
 	}