[BACK]Return to lonxml.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/lonxml.pm between versions 1.62 and 1.65

version 1.62, 2001/03/26 17:32:14 version 1.65, 2001/03/27 18:19:29
Line 249  sub callsub { Line 249  sub callsub {
  $safeeval,$style);   $safeeval,$style);
     }      }
     if (my $space=$Apache::lonxml::alltags{$token->[1]}) {      if (my $space=$Apache::lonxml::alltags{$token->[1]}) {
       &Apache::lonxml::debug("Calling sub $sub in $space $metamode<br />\n");  #      &Apache::lonxml::debug("Calling sub $sub in $space $metamode<br />\n");
       $sub1="$space\:\:$sub";        $sub1="$space\:\:$sub";
       $Apache::lonxml::curdepth=join('_',@Apache::lonxml::depthcounter);        $Apache::lonxml::curdepth=join('_',@Apache::lonxml::depthcounter);
       $currentstring .= &$sub1($target,$token,$parstack,$parser,        $currentstring .= &$sub1($target,$token,$parstack,$parser,
      $safeeval,$style);       $safeeval,$style);
     } else {      } else {
       &Apache::lonxml::debug("NOT Calling sub $sub in $space $metamode<br />\n");  #      &Apache::lonxml::debug("NOT Calling sub $sub in $space $metamode<br />\n");
       if ($metamode <1) {        if ($metamode <1) {
  if (defined($token->[4]) && ($metamode < 1)) {   if (defined($token->[4]) && ($metamode < 1)) {
   $currentstring .= $token->[4];    $currentstring .= $token->[4];
Line 417  sub handler { Line 417  sub handler {
   } else {    } else {
     $request->content_type('text/html');      $request->content_type('text/html');
   }    }
     
 #  $request->print(<<ENDHEADER);  #  $request->print(<<ENDHEADER);
 #<html>  #<html>
 #<head>  #<head>
Line 427  sub handler { Line 427  sub handler {
 #ENDHEADER  #ENDHEADER
 #  &Apache::lonhomework::send_header($request);  #  &Apache::lonhomework::send_header($request);
   $request->send_http_header;    $request->send_http_header;
     
   return OK if $request->header_only;    return OK if $request->header_only;
   
   $request->print(&Apache::lontexconvert::header());    if ($target eq 'web') {
       $request->print(&Apache::lontexconvert::header());
   $request->print('<body bgcolor="#FFFFFF">'."\n");      $request->print('<body bgcolor="#FFFFFF">'."\n");
     }
   
   my $file=&Apache::lonnet::filelocation("",$request->uri);    my $file=&Apache::lonnet::filelocation("",$request->uri);
   my %mystyle;    my %mystyle;
Line 447  sub handler { Line 448  sub handler {
   $request->print($result);    $request->print($result);
   
   
   $request->print('</body>');    if ($target eq 'tex') {
   $request->print(&Apache::lontexconvert::footer());  #    $request->print('\end{document}'."\n");
     } elsif ($target eq 'web') {
       $request->print('</body>');
       $request->print(&Apache::lontexconvert::footer());
     }
   
   writeallows($request->uri);    writeallows($request->uri);
   return OK;    return OK;
 }  }
Removed from v.1.62  
changed lines
  Added in v.1.65

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>