--- loncom/xml/lonxml.pm	2005/10/18 21:46:19	1.384
+++ loncom/xml/lonxml.pm	2005/11/02 22:48:52	1.386
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.384 2005/10/18 21:46:19 albertel Exp $
+# $Id: lonxml.pm,v 1.386 2005/11/02 22:48:52 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -926,7 +926,7 @@ sub get_all_text_unbalanced {
     $tag='<'.$tag.'>';
     while ($token = $$pars[-1]->get_token) {
 	if (($token->[0] eq 'T')||($token->[0] eq 'C')||($token->[0] eq 'D')) {
-	    if ($token->[2]) {
+	    if ($token->[0] eq 'T' && $token->[2]) {
 		$result.='<![CDATA['.$token->[1].']]>';
 	    } else {
 		$result.=$token->[1];
@@ -1393,13 +1393,16 @@ ENDNOTFOUND
 	    }
 #
 # we are in construction space, see if edit mode forced
-            &Apache::loncommon::get_unprocessed_cgi
-                          ($ENV{'QUERY_STRING'},['editmode']);
+            &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+						    ['editmode']);
 	}
 	if (!$env{'form.editmode'} || $env{'form.viewmode'}) {
 	    $result = &Apache::lonxml::xmlparse($request,$target,$filecontents,
 						'',%mystyle);
 	    undef($Apache::lonhomework::parsing_a_task);
+	    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+						    ['rawmode']);
+	    if ($env{'rawmode'}) { $result = $filecontents; }
 	}
     }