--- loncom/xml/lonxml.pm 2001/01/05 19:45:03 1.44
+++ loncom/xml/lonxml.pm 2001/02/13 00:15:49 1.51
@@ -3,6 +3,7 @@
#
# last modified 06/26/00 by Alexander Sakharuk
# 11/6 Gerd Kortemeyer
+# 6/1/1 Gerd Kortemeyer
package Apache::lonxml;
use vars
@@ -12,6 +13,7 @@ use HTML::TokeParser;
use Safe;
use Safe::Hole;
use Opcode;
+use Apache::Constants qw(:common);
sub register {
my $space;
@@ -22,7 +24,13 @@ sub register {
$Apache::lonxml::alltags{$temptag}=$space;
}
}
-
+
+sub printalltags {
+ my $temp;
+ foreach $temp (sort keys %Apache::lonxml::alltags) {
+ &Apache::lonxml::debug("$temp -- $Apache::lonxml::alltags{$temp}");
+ }
+}
use Apache::style;
use Apache::lontexconvert;
use Apache::run;
@@ -42,10 +50,14 @@ sub xmlparse {
if ($target eq 'meta') {
$Apache::lonxml::textredirection = 0;
$Apache::lonxml::on_offimport = 1;
+ } elsif ($target eq 'grade') {
+ $Apache::lonxml::textredirection = 0;
+ $Apache::lonxml::on_offimport = 0;
} else {
$Apache::lonxml::textredirection = 1;
$Apache::lonxml::on_offimport = 0;
}
+ #&printalltags();
my @pars = ();
@Apache::lonxml::pwd=();
my $pwd=$ENV{'request.filename'};
@@ -108,7 +120,7 @@ sub xmlparse {
#clear out any tags that didn't end
while ($token->[1] ne $stack[$#stack]
&& ($#stack > -1)) {
- &Apache::lonxml::error("Unbalanced tags in resource $stack['-1']");
+ &Apache::lonxml::warning("Unbalanced tags in resource $stack['-1']");
pop @stack;pop @parstack;&decreasedepth($token);
}
@@ -182,7 +194,7 @@ sub recurse {
#clear out any tags that didn't end
while ($tokenpat->[1] ne $innerstack[$#innerstack]
&& ($#innerstack > -1)) {
- &Apache::lonxml::error("Unbalanced tags in resource $innerstack['-1']");
+ &Apache::lonxml::warning("Unbalanced tags in resource $innerstack['-1']");
pop @innerstack;pop @innerparstack;&decreasedepth($tokenpat);
}
$partstring = &callsub("end_$tokenpat->[1]",
@@ -268,7 +280,7 @@ sub decreasedepth {
$Apache::lonxml::olddepth=$Apache::lonxml::depth+1;
}
if ( $Apache::lonxml::depth < -1) {
- &Apache::lonxml::error("Unbalanced tags in resource");
+ &Apache::lonxml::warning("Unbalanced tags in resource");
$Apache::lonxml::depth='-1';
}
my $curdepth=join('_',@Apache::lonxml::depthcounter);
@@ -283,8 +295,9 @@ sub get_all_text {
my $token;
my $result='';
my $tag=substr($tag,1); #strip the / off the tag
-# &Apache::lonxml::debug("have:$tag:");
+ #&Apache::lonxml::debug("have:$tag:");
while (($depth >=0) && ($token = $pars->get_token)) {
+ #&Apache::lonxml::debug("token:$token->[0]:$depth:$token->[1]");
if ($token->[0] eq 'T') {
$result.=$token->[1];
} elsif ($token->[0] eq 'S') {
@@ -298,6 +311,7 @@ sub get_all_text {
}
}
}
+# &Apache::lonxml::debug("Exit:$result:");
return $result
}
@@ -319,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]};
@@ -341,7 +356,7 @@ sub handler {
my $request=shift;
my $target='web';
-# $Apache::lonxml::debug=1;
+ $Apache::lonxml::debug=0;
if ($ENV{'browser.mathml'}) {
$request->content_type('text/xml');
} else {
@@ -358,22 +373,29 @@ sub handler {
# &Apache::lonhomework::send_header($request);
$request->send_http_header;
- return 'OK' if $request->header_only;
+ return OK if $request->header_only;
$request->print(&Apache::lontexconvert::header());
$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);
- return 'OK';
+ return OK;
}
$Apache::lonxml::debug=0;
@@ -382,9 +404,11 @@ sub debug {
print "DEBUG:".$_[0]."
\n";
}
}
+
sub error {
-# print "ERROR:".$_[0]."
\n";
+ print "ERROR:".$_[0]."
\n";
}
+
sub warning {
if ($Apache::lonxml::debug eq 1) {
print "WARNING:".$_[0]."
\n";
@@ -393,21 +417,3 @@ sub warning {
1;
__END__
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-