--- loncom/xml/lonxml.pm	2002/04/10 14:46:30	1.166
+++ loncom/xml/lonxml.pm	2002/05/01 21:40:25	1.168
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.166 2002/04/10 14:46:30 matthew Exp $
+# $Id: lonxml.pm,v 1.168 2002/05/01 21:40:25 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -62,7 +62,7 @@ package Apache::lonxml;
 use vars 
 qw(@pwd @outputstack $redirection $import @extlinks $metamode $evaluate %insertlist @namespace);
 use strict;
-use HTML::TokeParser();
+use HTML::LCParser();
 use HTML::TreeBuilder();
 use HTML::Entities();
 use Safe();
@@ -336,26 +336,20 @@ sub registerurl {
     if ($ENV{'browser.type'} eq 'explorer') { $nothing='javascript:void(0);'; }
     if (($ENV{'REQUEST_URI'}!~/^\/(res\/)*adm\//) || ($forcereg)) {
         my $hwkadd='';
-        if ($ENV{'REQUEST_URI'}=~/\.(problem|exam|quiz|assess|survey|form)$/) {
+        if ($ENV{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form)$/) {
 	    if (&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) {
 		$hwkadd.=(<<ENDSUBM);
-                     menu.switchbutton
-           (7,1,'subm.gif','view sub','missions',
-                'gocmd("/adm/grades","submission")');
+                     menu.switchbutton(7,1,'subm.gif','view sub','missions','gocmd("/adm/grades","submission")');
 ENDSUBM
             }
 	    if (&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'})) {
 		$hwkadd.=(<<ENDGRDS);
-                     menu.switchbutton
-           (7,2,'pgrd.gif','problem','grades',
-                'gocmd("/adm/grades","viewgrades")');
+                     menu.switchbutton(7,2,'pgrd.gif','problem','grades','gocmd("/adm/grades","viewgrades")');
 ENDGRDS
             }
 	    if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) {
 		$hwkadd.=(<<ENDPARM);
-                     menu.switchbutton
-           (7,3,'pparm.gif','problem','parms',
-                'gocmd("/adm/parmset","set")');
+                     menu.switchbutton(7,3,'pparm.gif','problem','parms','gocmd("/adm/parmset","set")');
 ENDPARM
             }
 	}
@@ -654,6 +648,8 @@ sub inner_xmlparse {
   #   $finaloutput.=&endredirection;
   # }
 
+  # Encode any high ASCII characters
+  $finaloutput=&HTML::Entities::encode($finaloutput,"\200-\377");
   if (($ENV{'QUERY_STRING'}) && ($target eq 'web')) {
     $finaloutput=&afterburn($finaloutput);
   }
@@ -1003,9 +999,8 @@ sub get_all_text {
 
 sub newparser {
   my ($parser,$contentref,$dir) = @_;
-  push (@$parser,HTML::TokeParser->new($contentref));
+  push (@$parser,HTML::LCParser->new($contentref));
   $$parser['-1']->xml_mode('1');
-#  $$parser['-1']->attr_encoded('1');
   if ( $dir eq '' ) {
     push (@Apache::lonxml::pwd, $Apache::lonxml::pwd[$#Apache::lonxml::pwd]);
   } else {
@@ -1249,7 +1244,7 @@ sub debug {
 sub error {
   if (($Apache::lonxml::debug eq 1) || ($ENV{'request.state'} eq 'construct') ) {
     # If printing in construction space, put the error inside <pre></pre>
-    print "<b>ERROR:</b><pre>".join("\n",@_)."</pre>\n";
+    print "<b>ERROR:</b>".join("\n",@_)."\n";
   } else {
     print "<b>An Error occured while processing this resource. The instructor has been notified.</b> <br />";
     #notify author