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

Diff for /loncom/xml/lonxml.pm between versions 1.25 and 1.27

version 1.25, 2000/10/11 13:07:49 version 1.27, 2000/10/11 21:12:42
Line 50  sub xmlparse { Line 50  sub xmlparse {
 #need to inspect this class of ops  #need to inspect this class of ops
 # $safeeval->deny(":base_orig");  # $safeeval->deny(":base_orig");
  $safeinit .= ';$external::target='.$target.';';   $safeinit .= ';$external::target='.$target.';';
    $safeinit .= ';$external::randomseed='.&Apache::lonnet::rndseed().';';
  &Apache::run::run($safeinit,$safeeval);   &Apache::run::run($safeinit,$safeeval);
 #-------------------- Redefinition of the target in the case of compound target  #-------------------- Redefinition of the target in the case of compound target
   
Line 201  sub callsub { Line 202  sub callsub {
       my $sub1;        my $sub1;
     no strict 'refs';      no strict 'refs';
     if (my $space=$Apache::lonxml::alltags{$token->[1]}) {      if (my $space=$Apache::lonxml::alltags{$token->[1]}) {
 #      &Apache::lonxml::debug("Calling sub $sub in $space<br>\n");        #&Apache::lonxml::debug("Calling sub $sub in $space<br>\n");
 #      if ( $sub eq "start_parserlib" ) {  
 #  print "me:".%$style.":\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);
 #      if ( $sub eq "start_parserlib" ) {  
 #  print "me2:".%$style.":";  
 #      }  
     } else {      } else {
       #&Apache::lonxml::debug("NOT Calling sub $sub in $space<br>\n");        #&Apache::lonxml::debug("NOT Calling sub $sub in $space<br>\n");
       if (defined($token->[4])) {        if (defined($token->[4])) {
Line 296  sub parstring { Line 291  sub parstring {
   } @{$token->[3]};    } @{$token->[3]};
   return $temp;    return $temp;
 }  }
 #<<<<<<< lonxml.pm  
   
 sub handler {  sub handler {
   my $request=shift;    my $request=shift;
   
   my $target='web';    my $target='web';
   $Apache::lonxml::debug=1;    $Apache::lonxml::debug=1;
   $request->content_type('text/html');  
 #  $request->send_http_header;    
   if ($ENV{'browser.mathml'}) {    if ($ENV{'browser.mathml'}) {
     $request->print( '<?xml version="1.0"?>'      $request->content_type('text/xml');
             .'<?xml-stylesheet type="text/css" href="/adm/MathML/mathml.css"?>'    } else {
             .'<!DOCTYPE html SYSTEM "/adm/MathML/mathml.dtd" '      $request->content_type('text/html');
             .'[<!ENTITY mathns "http://www.w3.org/1998/Math/MathML">]>'  
             .'<html xmlns:math="http://www.w3.org/1998/Math/MathML" '   
             .'xmlns="http://www.w3.org/TR/REC-html40">'  
  .'<body bgcolor="#FFFFFF">'."\n");  
   } else {        
     my $headerstring='<html>';  
       if ($ENV{'browser.os'} eq 'mac') {   
          $headerstring.="<head>\n"  
              .'<meta Content-Type="text/html; charset=x-mac-roman">'  
      ."\n</head>\n";  
       }  
     $request->print($headerstring.'<body bgcolor="#FFFFFF">'."\n");  
   }    }
 #  $request->print(<<ENDHEADER);    $request->send_http_header;
 #<html>  
 #<head>    return OK if $request->header_only;
 #<title>Just test</title>  
 #</head>    $request->print(&Apache::lontexconvert::header());
 #<body bgcolor="#FFFFFF">  
 #ENDHEADER    $request->print($headerstring.'<body bgcolor="#FFFFFF">'."\n");
 #  &Apache::lonhomework::send_header($request);  
   my $file = "/home/httpd/html".$request->uri;    my $file = "/home/httpd/html".$request->uri;
   my %mystyle;    my %mystyle;
   my $result = '';    my $result = '';
   $result = Apache::lonxml::xmlparse($target, &Apache::lonnet::getfile($file),'',%mystyle);    $result = Apache::lonxml::xmlparse($target, &Apache::lonnet::getfile($file),'',%mystyle);
 #  $request->print("Result follows:");    
   $request->print($result);    $request->print($result);
 #  $request->print(":Result ends");    $r->print('</body>');
     $r->print(&Apache::lontexconvert::footer());
     return OK;
 }  }
     
 $Apache::lonxml::debug=0;  $Apache::lonxml::debug=0;
Removed from v.1.25  
changed lines
  Added in v.1.27

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