--- loncom/xml/lonxml.pm 2003/01/15 23:59:27 1.225 +++ loncom/xml/lonxml.pm 2003/02/07 21:55:57 1.228 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # XML Parser Module # -# $Id: lonxml.pm,v 1.225 2003/01/15 23:59:27 www Exp $ +# $Id: lonxml.pm,v 1.228 2003/02/07 21:55:57 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -41,7 +41,6 @@ # 6/1/1 Gerd Kortemeyer # 2/21,3/13 Guy # 3/29,5/4 Gerd Kortemeyer -# 5/10 Scott Harrison # 5/26 Gerd Kortemeyer # 5/27 H. K. Ng # 6/2,6/3,6/8,6/9 Gerd Kortemeyer @@ -271,7 +270,7 @@ sub tokeninputfield { my $defhost=$Apache::lonnet::perlvar{'lonHostID'}; $defhost=~tr/a-z/A-Z/; return (< +\n"; @@ -404,7 +403,7 @@ sub registerurl { (!&Apache::lonnet::is_on_map($ENV{'REQUEST_URI'}))) && (!$forcereg)) { return $result. - ''; + ''; } if ($Apache::lonxml::registered && !$forcereg) { return ''; } $Apache::lonxml::registered=1; @@ -1145,11 +1144,11 @@ sub get_all_text { } } } + if (($depth >=0) && ($#$pars == 0) ) { $top_empty=1; } if (($depth >=0) && ($#$pars > 0) ) { pop(@$pars); pop(@Apache::lonxml::pwd); } - if (($depth >=0) && ($#$pars == 0) ) { &debug("here4");$top_empty=1; } } if ($top_empty && $depth >= 0) { #never found the end tag ran out of text, throw error send back blank @@ -1265,7 +1264,7 @@ sub afterburn { $matchthis=~s/\_+/\\s\+/g; $result=~s/($matchthis)/\$1\<\/a\>/s; $result.=(<<"ENDSCRIPT"); - ENDSCRIPT