--- loncom/xml/lonxml.pm	2003/09/14 23:57:18	1.276
+++ loncom/xml/lonxml.pm	2003/09/19 20:29:29	1.279
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.276 2003/09/14 23:57:18 www Exp $
+# $Id: lonxml.pm,v 1.279 2003/09/19 20:29:29 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -175,18 +175,13 @@ sub xmlbegin {
 }
 
 sub xmlend {
-    my ($discussiononly,$symb)=@_;
-    my $discussion='';
-    if ($ENV{'request.course.id'}) {
-       my $crs='/'.$ENV{'request.course.id'};
-       if ($ENV{'request.course.sec'}) {
-          $crs.='_'.$ENV{'request.course.sec'};
-       }                 
-       $crs=~s/\_/\//g;
-       $discussion=&Apache::lonfeedback::list_discussion
-	   ($crs,$symb,$discussiononly);
+    my $mode='xml';
+    my $status='OPEN';
+    if ($Apache::lonhomework::parsing_a_problem) {
+	$mode='problem';
+	$status=$Apache::inputtags::status[-1]; 
     }
-    return $discussion.($discussiononly?'':'</html>');
+    return &Apache::lonfeedback::list_discussion().'</html>';
 }
 
 sub tokeninputfield {
@@ -496,9 +491,9 @@ sub inner_xmlparse {
       }
 
       # Encode any high ASCII characters
-      if (!$Apache::lonxml::prevent_entity_encode) {
-	$result=&HTML::Entities::encode($result,"\200-\377");
-      }
+#      if (!$Apache::lonxml::prevent_entity_encode) {
+#	$result=&HTML::Entities::encode($result,"\200-\377");
+#      }
       if ($Apache::lonxml::redirection) {
 	$Apache::lonxml::outputstack['-1'] .= $result;
       } else {