--- loncom/xml/lonxml.pm	2005/02/28 22:17:09	1.358
+++ loncom/xml/lonxml.pm	2005/03/10 19:10:31	1.362
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.358 2005/02/28 22:17:09 albertel Exp $
+# $Id: lonxml.pm,v 1.362 2005/03/10 19:10:31 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -178,13 +178,19 @@ sub xmlend {
 	$mode='problem';
 	$status=$Apache::inputtags::status[-1]; 
     }
-    my $discussion=&Apache::lonfeedback::list_discussion($mode,$status);    
+    my $discussion;
+    &Apache::loncommon::get_unprocessed_cgi
+        ($ENV{'query_string'},['LONCAPA_INTERNAL_no_discussion']);
+    if (! exists($ENV{'form.LONCAPA_INTERNAL_no_discussion'}) ||
+        $ENV{'form.LONCAPA_INTERNAL_no_discussion'} ne 'true') {
+        $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 {
-	return $discussion.'</html>';
+	return $discussion.&Apache::loncommon::endbodytag();
     }
 }
 
@@ -368,6 +374,9 @@ sub xmlparse {
  }
  &do_registered_ssi();
  if ($Apache::lonxml::counter_changed) { &store_counter() }
+ if ($ENV{'form.return_only_error_and_warning_counts'}) {
+     return "$errorcount:$warningcount";
+ }
  return $finaloutput;
 }
 
@@ -1289,8 +1298,7 @@ sub handler {
     $Apache::lonxml::debug=$ENV{'user.debug'};
     
     if ($ENV{'browser.mathml'}) {
-	#&Apache::loncommon::content_type($request,'text/xml');
-	&Apache::loncommon::content_type($request,'text/html');
+	&Apache::loncommon::content_type($request,'text/xml');
     } else {
 	&Apache::loncommon::content_type($request,'text/html');
     }