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

Diff for /loncom/xml/lonxml.pm between versions 1.74 and 1.81

version 1.74, 2001/05/13 20:01:11 version 1.81, 2001/05/30 15:27:13
Line 7 Line 7
 # 2/21,3/13 Guy  # 2/21,3/13 Guy
 # 3/29,5/4 Gerd Kortemeyer  # 3/29,5/4 Gerd Kortemeyer
 # 5/10 Scott Harrison  # 5/10 Scott Harrison
   # 5/26 Gerd Kortemeyer
   # 5/27 H. K. Ng
   
 package Apache::lonxml;   package Apache::lonxml; 
 use vars   use vars 
 qw(@pwd @outputstack $redirection $import @extlinks $metamode $evaluate %insertlist);  qw(@pwd @outputstack $redirection $import @extlinks $metamode $evaluate %insertlist @namespace);
 use strict;  use strict;
 use HTML::TokeParser;  use HTML::TokeParser;
 use Safe;  use Safe;
 use Safe::Hole;  use Safe::Hole;
   use Math::Cephes qw(:trigs :hypers :bessels erf erfc);
 use Opcode;  use Opcode;
   
 sub register {  sub register {
Line 34  use Apache::run; Line 37  use Apache::run;
 use Apache::londefdef;  use Apache::londefdef;
 use Apache::scripttag;  use Apache::scripttag;
 use Apache::edit;  use Apache::edit;
   use Apache::lonnet;
   use Apache::File;
   
 #==================================================   Main subroutine: xmlparse    #==================================================   Main subroutine: xmlparse  
 #debugging control, to turn on debugging modify the correct handler  #debugging control, to turn on debugging modify the correct handler
 $Apache::lonxml::debug=0;  $Apache::lonxml::debug=0;
Line 60  $evaluate = 1; Line 66  $evaluate = 1;
 # data structure for eidt mode, determines what tags can go into what other tags  # data structure for eidt mode, determines what tags can go into what other tags
 %insertlist=();  %insertlist=();
   
   #stores the list of active tag namespaces
   @namespace=();
   
 sub xmlbegin {  sub xmlbegin {
   my $output='';    my $output='';
   if ($ENV{'browser.mathml'}) {    if ($ENV{'browser.mathml'}) {
Line 165  sub xmlparse { Line 174  sub xmlparse {
  my $safehole = new Safe::Hole;   my $safehole = new Safe::Hole;
  $safeeval->permit("entereval");   $safeeval->permit("entereval");
  $safeeval->permit(":base_math");   $safeeval->permit(":base_math");
    $safeeval->permit("sort");
  $safeeval->deny(":base_io");   $safeeval->deny(":base_io");
  $safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT');   $safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT');
   
    $safehole->wrap(\&Math::Cephes::asin,$safeeval,'&asin');
    $safehole->wrap(\&Math::Cephes::acos,$safeeval,'&acos');
    $safehole->wrap(\&Math::Cephes::atan,$safeeval,'&atan');
    $safehole->wrap(\&Math::Cephes::sinh,$safeeval,'&sinh');
    $safehole->wrap(\&Math::Cephes::cosh,$safeeval,'&cosh');
    $safehole->wrap(\&Math::Cephes::tanh,$safeeval,'&tanh');
    $safehole->wrap(\&Math::Cephes::asinh,$safeeval,'&asinh');
    $safehole->wrap(\&Math::Cephes::acosh,$safeeval,'&acosh');
    $safehole->wrap(\&Math::Cephes::atanh,$safeeval,'&atanh');
    $safehole->wrap(\&Math::Cephes::erf,$safeeval,'&erf');
    $safehole->wrap(\&Math::Cephes::erfc,$safeeval,'&erfc');
    $safehole->wrap(\&Math::Cephes::j0,$safeeval,'&j0');
    $safehole->wrap(\&Math::Cephes::j1,$safeeval,'&j1');
    $safehole->wrap(\&Math::Cephes::jn,$safeeval,'&jn');
    $safehole->wrap(\&Math::Cephes::jv,$safeeval,'&jv');
    $safehole->wrap(\&Math::Cephes::y0,$safeeval,'&y0');
    $safehole->wrap(\&Math::Cephes::y1,$safeeval,'&y1');
    $safehole->wrap(\&Math::Cephes::yn,$safeeval,'&yn');
    $safehole->wrap(\&Math::Cephes::yv,$safeeval,'&yv');
   
 #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.';';
Line 376  sub callsub { Line 407  sub callsub {
       } elsif ($target eq 'modified') {        } elsif ($target eq 'modified') {
  if ($token->[0] eq 'S') {   if ($token->[0] eq 'S') {
   $currentstring = $token->[4];    $currentstring = $token->[4];
     $currentstring.=&Apache::edit::handle_insert();
  } else {   } else {
   $currentstring = $token->[2];    $currentstring = $token->[2];
  }   }
Line 565  ENDSCRIPT Line 597  ENDSCRIPT
     return $result;      return $result;
 }  }
   
   sub storefile {
       my ($file,$contents)=@_;
       if (my $fh=Apache::File->new('>'.$file)) {
    print $fh $contents;
           $fh->close();
       }
   }
   
   sub inserteditinfo {
         my ($result,$filecontents)=@_;
         unless ($filecontents) {
     $filecontents=(<<SIMPLECONTENT);
   <html>
   <head>
   <title>
                              Title of Document Goes Here
   </title>
   </head>
   <body bgcolor="#FFFFFF">
   
                              Body of Document Goes Here
   
   </body>
   </html>
   SIMPLECONTENT
         }
         my $editheader='<a href="#editsection">Edit below</a><hr />';
         my $editfooter=(<<ENDFOOTER);
   <hr />
   <a name="editsection" />
   <form method="post">
   <textarea cols="80" rows="40" name="filecont">$filecontents</textarea>
   <br />
   <input type="submit" name="savethisfile" value="Save this file" />
   </form>
   ENDFOOTER
         $result=~s/(\<body[^\>]*\>)/$1$editheader/is;
         $result=~s/(\<\/body\>)/$editfooter/is;
         return $result;
   }
   
 sub handler {  sub handler {
   my $request=shift;    my $request=shift;
   
Line 578  sub handler { Line 651  sub handler {
     $request->content_type('text/html');      $request->content_type('text/html');
   }    }
       
 #  $request->print(<<ENDHEADER);  
 #<html>  
 #<head>  
 #<title>Just test</title>  
 #</head>  
 #<body bgcolor="#FFFFFF">  
 #ENDHEADER  
 #  &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;
   
   
   my $file=&Apache::lonnet::filelocation("",$request->uri);    my $file=&Apache::lonnet::filelocation("",$request->uri);
   #
   # Edit action? Save file.
   #
     unless ($ENV{'request.state'} eq 'published') {
         if ($ENV{'form.savethisfile'}) {
     &storefile($file,$ENV{'form.filecont'});
         }
     }
   my %mystyle;    my %mystyle;
   my $result = '';     my $result = ''; 
   my $filecontents=&Apache::lonnet::getfile($file);    my $filecontents=&Apache::lonnet::getfile($file);
   if ($filecontents == -1) {    if ($filecontents == -1) {
     &Apache::lonxml::error("<b> Unable to find <i>$file</i></b>");      $result=(<<ENDNOTFOUND);
   <html>
   <head>
   <title>File not found</title>
   </head>
   <body bgcolor="#FFFFFF">
   <b>File not found: $file</b>
   </body>
   </html>
   ENDNOTFOUND
     $filecontents='';      $filecontents='';
   } else {    } else {
     $result = &Apache::lonxml::xmlparse($target,$filecontents,'',%mystyle);      $result = &Apache::lonxml::xmlparse($target,$filecontents,'',%mystyle);
   }    }
   
   #
   # Edit action? Insert editing commands
   #
     unless ($ENV{'request.state'} eq 'published') {
         $result=&inserteditinfo($result,$filecontents);
     }
   
   $request->print($result);    $request->print($result);
   
   writeallows($request->uri);    writeallows($request->uri);
Line 643  sub warning { Line 732  sub warning {
 }  }
   
 sub register_insert {  sub register_insert {
   my @data = split /\n/, &Apache::lonnet::getfile('/home/httpd/html/res/adm/includes/insertlist.tab');    my @data = split /\n/, &Apache::lonnet::getfile('/home/httpd/lonTabs/insertlist.tab');
   my $i;    my $i;
     my $tagnum=0;
   my @order;    my @order;
   for ($i=0;$i < $#data; $i++) {    for ($i=0;$i < $#data; $i++) {
     my $line = $data[$i];      my $line = $data[$i];
     if ( $line =~ /^\#/ || $line =~ /^\s*\n/) { next; }      if ( $line =~ /^\#/ || $line =~ /^\s*\n/) { next; }
     if ( $line =~ /TABLE/ ) { last; }      if ( $line =~ /TABLE/ ) { last; }
     my ($tag,$descrip,$function,$show) = split(/,/, $line);      my ($tag,$descrip,$function,$show) = split(/,/, $line);
     if ($show eq 'no') { next; }      $insertlist{"$tagnum.tag"} = $tag;
     $insertlist{"$tag.description"} = $descrip;      $insertlist{"$tagnum.description"} = $descrip;
     $insertlist{"$tag.function"} = $function;      $insertlist{"$tagnum.function"} = $function;
     push (@order,$tag);      $insertlist{"$tagnum.show"}= $show;
       $tagnum++;
   }    }
     $i++; #skipping TABLE line
     $tagnum = 0;
   for (;$i < $#data;$i++) {    for (;$i < $#data;$i++) {
     my $line = $data[$i];      my $line = $data[$i];
     my ($tag,@which) = split(/ +/,$line);      my ($mnemonic,@which) = split(/ +/,$line);
       my $tag = $insertlist{"$tagnum.tag"};
     for (my $j=0;$j <$#which;$j++) {      for (my $j=0;$j <$#which;$j++) {
       if ( $which[$j] eq 'Y' ) {        if ( $which[$j] eq 'Y' ) {
  push(@{ $insertlist{"$tag.which"} },$order[$j]);   if ($insertlist{"$j.show"} ne 'no') {
     push(@{ $insertlist{"$tag.which"} },$j);
    }
       }        }
     }      }
       $tagnum++;
   }    }
 }  }
 1;  1;
Removed from v.1.74  
changed lines
  Added in v.1.81

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