--- loncom/xml/lonxml.pm 2000/10/11 21:07:59 1.26
+++ loncom/xml/lonxml.pm 2000/10/11 21:12:42 1.27
@@ -291,47 +291,33 @@ sub parstring {
} @{$token->[3]};
return $temp;
}
-#<<<<<<< lonxml.pm
sub handler {
my $request=shift;
my $target='web';
$Apache::lonxml::debug=1;
- $request->content_type('text/html');
-# $request->send_http_header;
if ($ENV{'browser.mathml'}) {
- $request->print( ''
- .''
- .']>'
- .''
- .''."\n");
- } else {
- my $headerstring='';
- if ($ENV{'browser.os'} eq 'mac') {
- $headerstring.="\n"
- .''
- ."\n\n";
- }
- $request->print($headerstring.''."\n");
+ $request->content_type('text/xml');
+ } else {
+ $request->content_type('text/html');
}
-# $request->print(<
-#
-#Just test
-#
-#
-#ENDHEADER
-# &Apache::lonhomework::send_header($request);
+ $request->send_http_header;
+
+ return OK if $request->header_only;
+
+ $request->print(&Apache::lontexconvert::header());
+
+ $request->print($headerstring.''."\n");
+
my $file = "/home/httpd/html".$request->uri;
my %mystyle;
my $result = '';
$result = Apache::lonxml::xmlparse($target, &Apache::lonnet::getfile($file),'',%mystyle);
-# $request->print("Result follows:");
$request->print($result);
-# $request->print(":Result ends");
+ $r->print('');
+ $r->print(&Apache::lontexconvert::footer());
+ return OK;
}
$Apache::lonxml::debug=0;