--- loncom/xml/lonxml.pm	2005/03/10 02:34:59	1.361
+++ loncom/xml/lonxml.pm	2005/03/17 13:56:32	1.366
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.361 2005/03/10 02:34:59 www Exp $
+# $Id: lonxml.pm,v 1.366 2005/03/17 13:56:32 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -178,7 +178,13 @@ 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,'');
@@ -1050,7 +1056,8 @@ sub get_all_text {
 sub newparser {
   my ($parser,$contentref,$dir) = @_;
   push (@$parser,HTML::LCParser->new($contentref));
-  $$parser['-1']->xml_mode('1');
+  $$parser[-1]->xml_mode(1);
+  $$parser[-1]->marked_sections(1);
   if ( $dir eq '' ) {
     push (@Apache::lonxml::pwd, $Apache::lonxml::pwd[$#Apache::lonxml::pwd]);
   } else {
@@ -1245,7 +1252,7 @@ $initialize
 $xml_help
 <input type="hidden" name="editmode" value="$lt{'ed'}" />
 $buttons<br />
-<textarea cols="80" rows="44" name="filecont" id="filecont">$filecontents</textarea>
+<textarea style="width:100%" cols="80" rows="44" name="filecont" id="filecont">$filecontents</textarea>
 <br />$buttons
 <br />
 </form>
@@ -1291,14 +1298,12 @@ sub handler {
     
     $Apache::lonxml::debug=$ENV{'user.debug'};
     
-    if ($ENV{'browser.mathml'}) {
-	&Apache::loncommon::content_type($request,'text/xml');
-    } else {
-	&Apache::loncommon::content_type($request,'text/html');
-    }
+    &Apache::loncommon::content_type($request,'text/html');
     &Apache::loncommon::no_cache($request);
-    $request->set_last_modified(&Apache::lonnet::metadata($request->uri,
-							  'lastrevisiondate'));
+    if ($ENV{'request.state'} eq 'published') {
+	$request->set_last_modified(&Apache::lonnet::metadata($request->uri,
+							      'lastrevisiondate'));
+    }
     $request->send_http_header;
     
     return OK if $request->header_only;