--- loncom/xml/lonxml.pm 2002/10/11 20:09:36 1.200 +++ loncom/xml/lonxml.pm 2002/10/17 14:42:07 1.203 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # XML Parser Module # -# $Id: lonxml.pm,v 1.200 2002/10/11 20:09:36 www Exp $ +# $Id: lonxml.pm,v 1.203 2002/10/17 14:42:07 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -385,7 +385,7 @@ sub registerurl { if ($ENV{'browser.type'} eq 'explorer') { $nothing='javascript:void(0);'; } my $newmail=''; if (&Apache::lonmsg::newmail()) { - $newmail='menu.setstatus("you have","got mail");'; + $newmail='menu.setstatus("you have","messages");'; } my $timesync='menu.syncclock(1000*'.time.');'; if (($ENV{'REQUEST_URI'}!~/^\/(res\/)*adm\//) || ($forcereg)) { @@ -585,11 +585,7 @@ sub latex_special_symbols { $current_token=~s/\^/\\char94 /g; $current_token=~s/\~/\\char126 /g; $current_token=~s/(&[^a-z\#])/\\$1/g; - if ($current_token=~/ \#\w/) { - $current_token=~s/ \#(\w)/ \\#$1/; - } else { - $current_token=~s/([^&])(\#)/$1\\$2/g; - } + $current_token=~s/([^&])\#/$1\\#/g; $current_token=~s/(\$|_|{|})/\\$1/g; $current_token=~s/\\char92 /\\texttt{\\char92}/g; $current_token=~s/>/\$>\$/g; #more @@ -851,6 +847,14 @@ sub setup_globals { my ($request,$target)=@_; $Apache::lonxml::request=$request; $Apache::lonxml::registered = 0; + if ($ENV{'form.counter'}) { + $Apache::lonxml::counter=$ENV{'form.counter'} + } elsif (not defined $Apache::lonxml::counter) { + $Apache::lonxml::counter=1; + my %moreenv; + $moreenv{'form.counter'}=$Apache::lonxml::counter; + &Apache::lonnet::appenv(%moreenv); + } @Apache::lonxml::pwd=(); @Apache::lonxml::extlinks=(); if ($target eq 'meta') { @@ -1325,7 +1329,7 @@ ENDNOTFOUND sub debug { if ($Apache::lonxml::debug eq 1) { $|=1; - print("DEBUG:".&HTML::Entities::encode($_[0])."
\n"); + print('DEBUG:'.&HTML::Entities::encode($_[0])."\n"); } }