--- loncom/xml/lonxml.pm 2001/01/30 21:01:36 1.49 +++ loncom/xml/lonxml.pm 2001/02/13 00:15:49 1.51 @@ -333,7 +333,8 @@ sub parstring { map { unless ($_=~/\W/) { my $val=$token->[2]->{$_}; - if ($val =~ m/^[\%\@]/) { $val="\\".$val; } + $val =~ s/([\%\@\\])/\$1/; + #if ($val =~ m/^[\%\@]/) { $val="\\".$val; } $temp .= "my \$$_=\"$val\";" } } @{$token->[3]}; @@ -378,12 +379,19 @@ sub handler { $request->print(''."\n"); - my $file = "/home/httpd/html".$request->uri; + my $file=&Apache::lonnet::filelocation("",$request->uri); my %mystyle; - my $result = ''; - $result = Apache::lonxml::xmlparse($target, &Apache::lonnet::getfile($file),'',%mystyle); + my $result = ''; + my $filecontents=&Apache::lonnet::getfile($file); + if ($filecontents == -1) { + &Apache::lonxml::error(" Unable to find $file"); + $filecontents=''; + } else { + $result = &Apache::lonxml::xmlparse($target,$filecontents,'',%mystyle); + } $request->print($result); + $request->print(''); $request->print(&Apache::lontexconvert::footer()); writeallows($request->uri); @@ -409,21 +417,3 @@ sub warning { 1; __END__ - - - - - - - - - - - - - - - - - -