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

Diff for /loncom/xml/lonxml.pm between versions 1.77 and 1.80

version 1.77, 2001/05/25 14:02:10 version 1.80, 2001/05/28 18:27:46
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 
Line 15  use strict; Line 17  use strict;
 use HTML::TokeParser;  use HTML::TokeParser;
 use Safe;  use Safe;
 use Safe::Hole;  use Safe::Hole;
   use Math::Trig;
   use Math::Cephes qw(j0 j1 jn jv y0 y1 yn yv);
 use Opcode;  use Opcode;
   
 sub register {  sub register {
Line 34  use Apache::run; Line 38  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 170  sub xmlparse { Line 177  sub xmlparse {
  $safeeval->permit(":base_math");   $safeeval->permit(":base_math");
  $safeeval->permit("sort");   $safeeval->permit("sort");
  $safeeval->deny(":base_io");   $safeeval->deny(":base_io");
   # $safe->share_from('Math::Trig',['acsc','asin','acos','atan']);
  $safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT');   $safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT');
    $safehole->wrap(\&Math::Trig::acsc,$safeeval,'&acsc');
    $safehole->wrap(\&Math::Trig::acosec,$safeeval,'&acosec');
    $safehole->wrap(\&Math::Trig::asec,$safeeval,'&asec');
    $safehole->wrap(\&Math::Trig::acot,$safeeval,'&acot');
    $safehole->wrap(\&Math::Trig::acotan,$safeeval,'&acotan');
    $safehole->wrap(\&Math::Trig::acsch,$safeeval,'&acsch');
    $safehole->wrap(\&Math::Trig::acosech,$safeeval,'&acosech');
    $safehole->wrap(\&Math::Trig::asech,$safeeval,'&asech');
    $safehole->wrap(\&Math::Trig::acoth,$safeeval,'&acoth');
    $safehole->wrap(\&Math::Trig::acotanh,$safeeval,'&acotanh');
    $safehole->wrap(\&Math::Trig::asin,$safeeval,'&asin');
    $safehole->wrap(\&Math::Trig::acos,$safeeval,'&acos');
    $safehole->wrap(\&Math::Trig::atan,$safeeval,'&atan');
    $safehole->wrap(\&Math::Trig::asinh,$safeeval,'&asinh');
    $safehole->wrap(\&Math::Trig::acosh,$safeeval,'&acosh');
    $safehole->wrap(\&Math::Trig::atanh,$safeeval,'&atanh');
    $safehole->wrap(\&Math::Trig::atan2,$safeeval,'&atan2');
    $safehole->wrap(\&Math::Trig::csc,$safeeval,'&csc');
    $safehole->wrap(\&Math::Trig::cosec,$safeeval,'&cosec');
    $safehole->wrap(\&Math::Trig::sec,$safeeval,'&sec');
    $safehole->wrap(\&Math::Trig::cot,$safeeval,'&cot');
    $safehole->wrap(\&Math::Trig::cotan,$safeeval,'&cotan');
    $safehole->wrap(\&Math::Trig::csch,$safeeval,'&csch');
    $safehole->wrap(\&Math::Trig::cosech,$safeeval,'&cosech');
    $safehole->wrap(\&Math::Trig::sech,$safeeval,'&sech');
    $safehole->wrap(\&Math::Trig::coth,$safeeval,'&coth');
    $safehole->wrap(\&Math::Trig::cotanh,$safeeval,'&cptanh');
    $safehole->wrap(\&Math::Trig::deg2rad,$safeeval,'&deg2rad');
    $safehole->wrap(\&Math::Trig::deg2grad,$safeeval,'&deg2grad');
    $safehole->wrap(\&Math::Trig::grad2deg,$safeeval,'&grad2deg');
    $safehole->wrap(\&Math::Trig::grad2rad,$safeeval,'&grad2rad');
    $safehole->wrap(\&Math::Trig::rad2deg,$safeeval,'&rad2deg');
    $safehole->wrap(\&Math::Trig::rad2grad,$safeeval,'&rad2grad');
    $safehole->wrap(\&Math::Trig::pi,$safeeval,'&pi');
    $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 570  ENDSCRIPT Line 623  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 583  sub handler { Line 677  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);
Removed from v.1.77  
changed lines
  Added in v.1.80

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