[LON-CAPA-cvs] cvs: loncom /homework structuretags.pm /interface lonfeedback.pm /xml lonxml.pm

[sakharuk]

sakharuk		Tue Aug 10 14:25:54 2004 EDT

  Modified files:              
    /loncom/homework	structuretags.pm 
    /loncom/interface	lonfeedback.pm 
    /loncom/xml	lonxml.pm 
  Log:
  Cleanup for bug 2838 is done.
  
  
Index: loncom/homework/structuretags.pm
diff -u loncom/homework/structuretags.pm:1.262 loncom/homework/structuretags.pm:1.263
--- loncom/homework/structuretags.pm:1.262	Tue Aug 10 14:04:22 2004
+++ loncom/homework/structuretags.pm	Tue Aug 10 14:25:53 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.262 2004/08/10 18:04:22 sakharuk Exp $
+# $Id: structuretags.pm,v 1.263 2004/08/10 18:25:53 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -646,7 +646,7 @@
 		    $endminipage = '\end{minipage}';
 		}
                 if ($ENV{'form.print_discussions'} eq 'yes') {
-		    $result.=&Apache::lonxml::xmlend($target,$tagstack,$parstack,$parser,$safeeval);
+		    $result.=&Apache::lonxml::xmlend($target,$parser);
 		    $result=~s/<\/html>//;
 		} else {
 		    $result .= '\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
Index: loncom/interface/lonfeedback.pm
diff -u loncom/interface/lonfeedback.pm:1.114 loncom/interface/lonfeedback.pm:1.115
--- loncom/interface/lonfeedback.pm:1.114	Tue Aug 10 14:01:25 2004
+++ loncom/interface/lonfeedback.pm	Tue Aug 10 14:25:53 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.114 2004/08/10 18:01:25 sakharuk Exp $
+# $Id: lonfeedback.pm,v 1.115 2004/08/10 18:25:53 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -65,7 +65,7 @@
 }
 
 sub list_discussion {
-    my ($mode,$status,$symb,$ttarget,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my ($mode,$status,$symb)=@_;
     my $outputtarget=$ENV{'form.grade_target'};
     if (not &discussion_visible($status)) { return ''; }
     my @bgcols = ("#cccccc","#eeeeee");
@@ -764,9 +764,6 @@
                     $discussionitems[$alldiscussion{$_}]=~s/(<b>|<\/b>|<\/a>|<a([^>]+)>)//g;
 
 		    $discussionitems[$alldiscussion{$_}]='<tex>\vskip 0 mm\noindent\makebox[2 cm][b]{\hrulefill}</tex>'.$discussionitems[$alldiscussion{$_}];
-		    if ($_ eq $showposts[-1]) {
-			$discussionitems[$alldiscussion{$_}].='<tex>\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\end{document}</tex>';
-		    }
 		    $discussion.=$discussionitems[$alldiscussion{$_}];
 		}
 	    }
Index: loncom/xml/lonxml.pm
diff -u loncom/xml/lonxml.pm:1.334 loncom/xml/lonxml.pm:1.335
--- loncom/xml/lonxml.pm:1.334	Tue Aug 10 14:03:30 2004
+++ loncom/xml/lonxml.pm	Tue Aug 10 14:25:53 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.334 2004/08/10 18:03:30 sakharuk Exp $
+# $Id: lonxml.pm,v 1.335 2004/08/10 18:25:53 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -165,15 +165,16 @@
 }
 
 sub xmlend {
-    my ($target,$tagstack,$parstack,$parser,$safeeval)=@_;
+    my ($target,$parser)=@_;
     my $mode='xml';
     my $status='OPEN';
     if ($Apache::lonhomework::parsing_a_problem) {
 	$mode='problem';
 	$status=$Apache::inputtags::status[-1]; 
     }
-    my $discussion=&Apache::lonfeedback::list_discussion($mode,$status,'',$target,$tagstack,$parstack,$parser,$safeeval);
+    my $discussion=&Apache::lonfeedback::list_discussion($mode,$status);    
     if ($target eq 'tex') {
+	$discussion.='<tex>\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\end{document}</tex>';
 	&Apache::lonxml::newparser($parser,\$discussion,'');
 	return '';
     } else {