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

[sakharuk]

sakharuk		Wed Jun 23 13:43:32 2004 EDT

  Modified files:              
    /loncom/homework	structuretags.pm 
  Log:
  Bug 2838 (print attached discussions too) is fixed.
  
  
Index: loncom/homework/structuretags.pm
diff -u loncom/homework/structuretags.pm:1.256 loncom/homework/structuretags.pm:1.257
--- loncom/homework/structuretags.pm:1.256	Fri Jun 11 21:09:30 2004
+++ loncom/homework/structuretags.pm	Wed Jun 23 13:43:31 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.256 2004/06/12 01:09:30 www Exp $
+# $Id: structuretags.pm,v 1.257 2004/06/23 17:43:31 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -567,7 +567,7 @@
 	    my @due_file_content = <$temp_file>;
 	    my $due_file_content = $due_file_content[$#due_file_content];
 	    chomp $due_file_content;
-	    my $name_of_resourse= &Apache::lonxml::latex_special_symbols(&get_resource_name($parstack,$safeeval));
+	    my $name_of_resourse= &Apache::lonxml::latex_special_symbols(&get_resource_name($parstack,$safeeval),'header');
 	    if ($due_file_content ne $duedate) {
 		$temp_file = Apache::File->new('>'.$filename);
 		print $temp_file "$duedate\n";
@@ -646,6 +646,10 @@
 		if (not $ENV{'form.problem_split'}=~/yes/) {
 		    $endminipage = '\end{minipage}';
 		}
+                if ($ENV{'form.print_discussions'} eq 'yes') {
+		    $result.=&Apache::lonxml::xmlend();
+		    $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} ';