--- loncom/xml/lonxml.pm 2001/03/27 16:57:20 1.63
+++ loncom/xml/lonxml.pm 2001/03/27 17:47:43 1.64
@@ -29,7 +29,7 @@ sub register {
sub printalltags {
my $temp;
foreach $temp (sort keys %Apache::lonxml::alltags) {
-# &Apache::lonxml::debug("$temp -- $Apache::lonxml::alltags{$temp}");
+ &Apache::lonxml::debug("$temp -- $Apache::lonxml::alltags{$temp}");
}
}
use Apache::style;
@@ -106,9 +106,7 @@ sub xmlparse {
# add parameters list to another stack
push (@parstack,&parstring($token));
&increasedepth($token);
-# &Apache::lonxml::debug("Checking for $token->[1] style");
if (exists $style_for_target{$token->[1]}) {
-# &Apache::lonxml::debug("Found $token->[1] style");
if ($Apache::lonxml::redirection) {
$Apache::lonxml::outputstack['-1'] .=
&recurse($style_for_target{$token->[1]},$target,$safeeval,
@@ -118,7 +116,6 @@ sub xmlparse {
$safeeval,\%style_for_target,@parstack);
}
} else {
-# &Apache::lonxml::debug("No style for for $token->[1]");
$result = &callsub("start_$token->[1]", $target, $token,\@parstack,
\@pars, $safeeval, \%style_for_target);
}
@@ -304,7 +301,7 @@ sub increasedepth {
$Apache::lonxml::olddepth=$Apache::lonxml::depth;
}
my $curdepth=join('_',@Apache::lonxml::depthcounter);
-# &Apache::lonxml::debug("s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1]\n");
+ &Apache::lonxml::debug("s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1]\n");
#print "
s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1]\n";
}
@@ -320,7 +317,7 @@ sub decreasedepth {
$Apache::lonxml::depth='-1';
}
my $curdepth=join('_',@Apache::lonxml::depthcounter);
-# &Apache::lonxml::debug("e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth\n");
+ &Apache::lonxml::debug("e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth\n");
#print "
e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth\n";
}
@@ -413,14 +410,14 @@ sub writeallows {
sub handler {
my $request=shift;
- my $target='tex';
+ my $target='web';
$Apache::lonxml::debug=1;
if ($ENV{'browser.mathml'}) {
$request->content_type('text/xml');
} else {
$request->content_type('text/html');
}
-
+
# $request->print(<
#
@@ -430,20 +427,12 @@ sub handler {
#ENDHEADER
# &Apache::lonhomework::send_header($request);
$request->send_http_header;
-
+
return OK if $request->header_only;
-## $request->print(&Apache::lontexconvert::header());
-
-## $request->print(''."\n");
-
- if ($target eq 'tex') {
-
-
-
- } else {
- $request->print(&Apache::lontexconvert::header());
- $request->print(''."\n");
+ if ($target eq 'web') {
+ $request->print(&Apache::lontexconvert::header());
+ $request->print(''."\n");
}
my $file=&Apache::lonnet::filelocation("",$request->uri);
@@ -459,14 +448,13 @@ sub handler {
$request->print($result);
-## $request->print('');
if ($target eq 'tex') {
# $request->print('\end{document}'."\n");
- } else {
+ } elsif ($target eq 'web') {
$request->print('');
$request->print(&Apache::lontexconvert::footer());
}
-## $request->print(&Apache::lontexconvert::footer());
+
writeallows($request->uri);
return OK;
}