Diff for /loncom/xml/lonxml.pm between versions 1.63 and 1.84

version 1.63, 2001/03/27 16:57:20 version 1.84, 2001/06/02 03:59:59
Line 5 Line 5
 # 11/6 Gerd Kortemeyer  # 11/6 Gerd Kortemeyer
 # 6/1/1 Gerd Kortemeyer  # 6/1/1 Gerd Kortemeyer
 # 2/21,3/13 Guy  # 2/21,3/13 Guy
   # 3/29,5/4 Gerd Kortemeyer
   # 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);  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;
 use Apache::Constants qw(:common);  
   
 sub register {  sub register {
   my $space;    my $space;
Line 26  sub register { Line 30  sub register {
   }    }
 }  }
   
 sub printalltags {  use Apache::Constants qw(:common);
   my $temp;  
   foreach $temp (sort keys %Apache::lonxml::alltags) {  
 #    &Apache::lonxml::debug("$temp -- $Apache::lonxml::alltags{$temp}");  
   }  
 }  
 use Apache::style;  
 use Apache::lontexconvert;  use Apache::lontexconvert;
   use Apache::style;
 use Apache::run;  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
   $Apache::lonxml::debug=0;
   
   #path to the directory containing the file currently being processed
 @pwd=();  @pwd=();
   
   #these two are used for capturing a subset of the output for later processing,
   #don't touch them directly use &startredirection and &endredirection
 @outputstack = ();  @outputstack = ();
 $redirection = 0;  $redirection = 0;
   
   #controls wheter the <import> tag actually does
 $import = 1;  $import = 1;
 @extlinks=();  @extlinks=();
   
   # meta mode is a bit weird only some output is to be turned off
   #<output> tag turns metamode off (defined in londefdef.pm)
 $metamode = 0;  $metamode = 0;
   
   # turns on and of run::evaluate actually derefencing var refs
   $evaluate = 1;
   
   # data structure for eidt mode, determines what tags can go into what other tags
   %insertlist=();
   
   #stores the list of active tag namespaces
   @namespace=();
   
   sub xmlbegin {
     my $output='';
     if ($ENV{'browser.mathml'}) {
         $output='<?xml version="1.0"?>'
               .'<?xml-stylesheet type="text/css" href="/adm/MathML/mathml.css"?>'
               .'<!DOCTYPE html SYSTEM "/adm/MathML/mathml.dtd" '
               .'[<!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">';
     } else {
         $output='<html>';
     }
     return $output;
   }
   
   sub xmlend {
       return '</html>';
   }
   
   sub fontsettings() {
       my $headerstring='';
       if (($ENV{'browser.os'} eq 'mac') && (!$ENV{'browser.mathml'})) { 
            $headerstring.=
                '<meta Content-Type="text/html; charset=x-mac-roman">';
       }
       return $headerstring;
   }
   
   sub registerurl {
     return (<<ENDSCRIPT);
   <script language="JavaScript">
   // BEGIN LON-CAPA Internal
       function LONCAPAreg() {
          if (window.location.pathname!="/res/adm/pages/menu.html") {
     menu=window.open("","LONCAPAmenu");
     menu.currentURL=window.location.pathname;
             menu.currentStale=0;
          }
       }
     
       function LONCAPAstale() {
          if (window.location.pathname!="/res/adm/pages/menu.html") {
     menu=window.open("","LONCAPAmenu");
             menu.currentStale=1;
          }
       }
   // END LON-CAPA Internal
   </script>
   ENDSCRIPT
   }
   
   sub loadevents() {
       return 'LONCAPAreg();';
   }
   
   sub unloadevents() {
       return 'LONCAPAstale();';
   }
   
   sub printalltags {
     my $temp;
     foreach $temp (sort keys %Apache::lonxml::alltags) {
       &Apache::lonxml::debug("$temp -- $Apache::lonxml::alltags{$temp}");
     }
   }
   
 sub xmlparse {  sub xmlparse {
   
  my ($target,$content_file_string,$safeinit,%style_for_target) = @_;   my ($target,$content_file_string,$safeinit,%style_for_target) = @_;
  if ($target eq 'meta') {   if ($target eq 'meta') {
    # meta mode is a bit weird only some output is to be turned off  
    #<output> tag turns metamode off (defined in londefdef.pm)  
    $Apache::lonxml::redirection = 0;     $Apache::lonxml::redirection = 0;
    $Apache::lonxml::metamode = 1;     $Apache::lonxml::metamode = 1;
      $Apache::lonxml::evaluate = 1;
    $Apache::lonxml::import = 0;     $Apache::lonxml::import = 0;
  } elsif ($target eq 'grade') {   } elsif ($target eq 'grade') {
    &startredirection;     &startredirection;
    $Apache::lonxml::metamode = 0;     $Apache::lonxml::metamode = 0;
      $Apache::lonxml::evaluate = 1;
    $Apache::lonxml::import = 1;     $Apache::lonxml::import = 1;
  } else {   } elsif ($target eq 'modified') {
      $Apache::lonxml::redirection = 0;
    $Apache::lonxml::metamode = 0;     $Apache::lonxml::metamode = 0;
      $Apache::lonxml::evaluate = 0;
      $Apache::lonxml::import = 0;
    } else {
    $Apache::lonxml::redirection = 0;     $Apache::lonxml::redirection = 0;
      $Apache::lonxml::metamode = 0;
      $Apache::lonxml::evaluate = 1;
    $Apache::lonxml::import = 1;     $Apache::lonxml::import = 1;
  }   }
  #&printalltags();   #&printalltags();
Line 77  sub xmlparse { Line 172  sub xmlparse {
   
  my $safeeval = new Safe;   my $safeeval = new Safe;
  my $safehole = new Safe::Hole;   my $safehole = new Safe::Hole;
  $safeeval->permit("entereval");   &init_safespace($target,$safeeval,$safehole,$safeinit);
  $safeeval->permit(":base_math");  
  $safeeval->deny(":base_io");  
  $safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT');  
 #need to inspect this class of ops  
 # $safeeval->deny(":base_orig");  
  $safeinit .= ';$external::target='.$target.';';  
  $safeinit .= ';$external::randomseed='.&Apache::lonnet::rndseed().';';  
  &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
   
  ($target, my @tenta) = split('&&',$target);   ($target, my @tenta) = split('&&',$target);
Line 106  sub xmlparse { Line 193  sub xmlparse {
        # add parameters list to another stack         # add parameters list to another stack
        push (@parstack,&parstring($token));         push (@parstack,&parstring($token));
        &increasedepth($token);                &increasedepth($token);       
 #       &Apache::lonxml::debug("Checking for $token->[1] style");  
        if (exists $style_for_target{$token->[1]}) {         if (exists $style_for_target{$token->[1]}) {
 #   &Apache::lonxml::debug("Found $token->[1] style");  
  if ($Apache::lonxml::redirection) {   if ($Apache::lonxml::redirection) {
    $Apache::lonxml::outputstack['-1'] .=       $Apache::lonxml::outputstack['-1'] .=  
      &recurse($style_for_target{$token->[1]},$target,$safeeval,       &recurse($style_for_target{$token->[1]},$target,$safeeval,
Line 118  sub xmlparse { Line 203  sub xmlparse {
     $safeeval,\%style_for_target,@parstack);      $safeeval,\%style_for_target,@parstack);
  }   }
        } else {         } else {
 #   &Apache::lonxml::debug("No style for for $token->[1]");   $result = &callsub("start_$token->[1]", $target, $token, \@stack,
  $result = &callsub("start_$token->[1]", $target, $token,\@parstack,      \@parstack, \@pars, $safeeval, \%style_for_target);
     \@pars, $safeeval, \%style_for_target);  
        }                       }              
      } elsif ($token->[0] eq 'E')  {       } elsif ($token->[0] eq 'E')  {
        #clear out any tags that didn't end         #clear out any tags that didn't end
Line 141  sub xmlparse { Line 225  sub xmlparse {
  }   }
   
        } else {         } else {
  $result = &callsub("end_$token->[1]", $target, $token, \@parstack,   $result = &callsub("end_$token->[1]", $target, $token, \@stack, 
     \@pars,$safeeval, \%style_for_target);      \@parstack, \@pars,$safeeval, \%style_for_target);
        }         }
      } else {       } else {
        &Apache::lonxml::error("Unknown token event :$token->[0]:$token->[1]:");         &Apache::lonxml::error("Unknown token event :$token->[0]:$token->[1]:");
Line 173  sub xmlparse { Line 257  sub xmlparse {
 # if ($target eq 'meta') {  # if ($target eq 'meta') {
 #   $finaloutput.=&endredirection;  #   $finaloutput.=&endredirection;
 # }  # }
   
     if (($ENV{'QUERY_STRING'}) && ($target eq 'web')) {
         $finaloutput=&afterburn($finaloutput);
     }
   
  return $finaloutput;   return $finaloutput;
 }  }
   
   
 sub recurse {  sub recurse {
       
   my @innerstack = ();     my @innerstack = (); 
Line 197  sub recurse { Line 287  sub recurse {
  push (@innerstack,$tokenpat->[1]);   push (@innerstack,$tokenpat->[1]);
  push (@innerparstack,&parstring($tokenpat));   push (@innerparstack,&parstring($tokenpat));
  &increasedepth($tokenpat);   &increasedepth($tokenpat);
  $partstring = &callsub("start_$tokenpat->[1]",    $partstring = &callsub("start_$tokenpat->[1]", $target, $tokenpat,
        $target, $tokenpat, \@innerparstack,         \@innerstack, \@innerparstack, \@pat,
        \@pat, $safeeval, $style_for_target);         $safeeval, $style_for_target);
       } elsif ($tokenpat->[0] eq 'E') {        } elsif ($tokenpat->[0] eq 'E') {
  #clear out any tags that didn't end   #clear out any tags that didn't end
  while ($tokenpat->[1] ne $innerstack[$#innerstack]    while ($tokenpat->[1] ne $innerstack[$#innerstack] 
Line 207  sub recurse { Line 297  sub recurse {
   &Apache::lonxml::warning("Unbalanced tags in resource $innerstack['-1']");    &Apache::lonxml::warning("Unbalanced tags in resource $innerstack['-1']");
   pop @innerstack;pop @innerparstack;&decreasedepth($tokenpat);    pop @innerstack;pop @innerparstack;&decreasedepth($tokenpat);
  }   }
  $partstring = &callsub("end_$tokenpat->[1]",   $partstring = &callsub("end_$tokenpat->[1]", $target, $tokenpat,
        $target, $tokenpat, \@innerparstack,         \@innerstack, \@innerparstack, \@pat,
        \@pat, $safeeval, $style_for_target);         $safeeval, $style_for_target);
       } else {        } else {
  &Apache::lonxml::error("Unknown token event :$tokenpat->[0]:$tokenpat->[1]:");   &Apache::lonxml::error("Unknown token event :$tokenpat->[0]:$tokenpat->[1]:");
       }        }
Line 242  sub recurse { Line 332  sub recurse {
 }  }
   
 sub callsub {  sub callsub {
   my ($sub,$target,$token,$parstack,$parser,$safeeval,$style)=@_;    my ($sub,$target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   my $currentstring='';    my $currentstring='';
     my $nodefault;
   {    {
     my $sub1;      my $sub1;
     no strict 'refs';      no strict 'refs';
     if ($target eq 'edit' && $token->[0] eq 'S') {      if ($target eq 'edit' && $token->[0] eq 'S') {
       $currentstring = &Apache::edit::tag_start($target,$token,$parstack,$parser,        $currentstring = &Apache::edit::tag_start($target,$token,$tagstack,
    $parstack,$parser,
  $safeeval,$style);   $safeeval,$style);
     }      }
     if (my $space=$Apache::lonxml::alltags{$token->[1]}) {      my $tag=$token->[1];
 #      &Apache::lonxml::debug("Calling sub $sub in $space $metamode<br />\n");      my $space=$Apache::lonxml::alltags{$tag};
       if (!$space) {
    $tag=~tr/A-Z/a-z/;
    $sub=~tr/A-Z/a-z/;
    $space=$Apache::lonxml::alltags{$tag}
       }
       if ($space) {
         #&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,$nodefault) = &$sub1($target,$token,$tagstack,
      $safeeval,$style);     $parstack,$parser,$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];
  } else {   } else {
   $currentstring .= $token->[2];    $currentstring = $token->[2];
  }   }
       }        }
     }      }
     if ($target eq 'edit' && $token->[0] eq 'E') {  #    &Apache::lonxml::debug("nodefalt:$nodefault:");
       $currentstring .= &Apache::edit::tag_end($target,$token,$parstack,$parser,      if ($currentstring eq '' && $nodefault eq '') {
  $safeeval,$style);        if ($target eq 'edit') {
    &Apache::lonxml::debug("doing default edit for $token->[1]");
    if ($token->[0] eq 'S') {
     $currentstring = &Apache::edit::tag_start($target,$token);
    } elsif ($token->[0] eq 'E') {
     $currentstring = &Apache::edit::tag_end($target,$token);
    }
         } elsif ($target eq 'modified') {
    if ($token->[0] eq 'S') {
     $currentstring = $token->[4];
     $currentstring.=&Apache::edit::handle_insert();
    } else {
     $currentstring = $token->[2];
    }
         }
     }      }
     use strict 'refs';      use strict 'refs';
   }    }
   return $currentstring;    return $currentstring;
 }  }
   
   sub init_safespace {
     my ($target,$safeeval,$safehole,$safeinit) = @_;
     $safeeval->permit("entereval");
     $safeeval->permit(":base_math");
     $safeeval->permit("sort");
     $safeeval->deny(":base_io");
     $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
   # $safeeval->deny(":base_orig");
     $safeinit .= ';$external::target='.$target.';';
     $safeinit .= ';$external::randomseed='.&Apache::lonnet::rndseed().';';
     &Apache::run::run($safeinit,$safeeval);
   }
   
 sub startredirection {  sub startredirection {
   $Apache::lonxml::redirection++;    $Apache::lonxml::redirection++;
   push (@Apache::lonxml::outputstack, '');    push (@Apache::lonxml::outputstack, '');
Line 283  sub startredirection { Line 432  sub startredirection {
   
 sub endredirection {  sub endredirection {
   if (!$Apache::lonxml::redirection) {    if (!$Apache::lonxml::redirection) {
     &Apache::lonxml::error("Endredirection was called, before a startredirection, perhaps you have unbalanced tags. Some debuggin information:".join ":",caller);      &Apache::lonxml::error("Endredirection was called, before a startredirection, perhaps you have unbalanced tags. Some debuging information:".join ":",caller);
     return '';      return '';
   }    }
   $Apache::lonxml::redirection--;    $Apache::lonxml::redirection--;
Line 304  sub increasedepth { Line 453  sub increasedepth {
     $Apache::lonxml::olddepth=$Apache::lonxml::depth;      $Apache::lonxml::olddepth=$Apache::lonxml::depth;
   }    }
   my $curdepth=join('_',@Apache::lonxml::depthcounter);    my $curdepth=join('_',@Apache::lonxml::depthcounter);
 #  &Apache::lonxml::debug("s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1]\n");    &Apache::lonxml::debug("s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1]\n");
 #print "<br />s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1]\n";  #print "<br />s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1]\n";
 }  }
   
Line 320  sub decreasedepth { Line 469  sub decreasedepth {
     $Apache::lonxml::depth='-1';      $Apache::lonxml::depth='-1';
   }    }
   my $curdepth=join('_',@Apache::lonxml::depthcounter);    my $curdepth=join('_',@Apache::lonxml::depthcounter);
 #  &Apache::lonxml::debug("e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth\n");    &Apache::lonxml::debug("e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth\n");
 #print "<br />e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth\n";  #print "<br />e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth\n";
 }  }
   
Line 410  sub writeallows { Line 559  sub writeallows {
     &Apache::lonnet::appenv(%httpref);      &Apache::lonnet::appenv(%httpref);
 }  }
   
   #
   # Afterburner handles anchors, highlights and links
   #
   sub afterburn {
       my $result=shift;
       map {
          my ($name, $value) = split(/=/,$_);
          $value =~ tr/+/ /;
          $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
          if (($name eq 'highlight')||($name eq 'anchor')||($name eq 'link')) {
              unless ($ENV{'form.'.$name}) {
                 $ENV{'form.'.$name}=$value;
      }
          }
       } (split(/&/,$ENV{'QUERY_STRING'}));
       if ($ENV{'form.highlight'}) {
           map {
              my $anchorname=$_;
      my $matchthis=$anchorname;
              $matchthis=~s/\_+/\\s\+/g;
              $result=~s/($matchthis)/\<font color=\"red\"\>$1\<\/font\>/gs;
          } split(/\,/,$ENV{'form.highlight'});
       }
       if ($ENV{'form.link'}) {
           map {
              my ($anchorname,$linkurl)=split(/\>/,$_);
      my $matchthis=$anchorname;
              $matchthis=~s/\_+/\\s\+/g;
              $result=~s/($matchthis)/\<a href=\"$linkurl\"\>$1\<\/a\>/gs;
          } split(/\,/,$ENV{'form.link'});
       }
       if ($ENV{'form.anchor'}) {
           my $anchorname=$ENV{'form.anchor'};
    my $matchthis=$anchorname;
           $matchthis=~s/\_+/\\s\+/g;
           $result=~s/($matchthis)/\<a name=\"$anchorname\"\>$1\<\/a\>/s;
           $result.=(<<"ENDSCRIPT");
   <script>
       document.location.hash='$anchorname';
   </script>
   ENDSCRIPT
       }
       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;
     
   my $target='tex';    my $target='web';
   $Apache::lonxml::debug=1;  
     $Apache::lonxml::debug=0;
   
   if ($ENV{'browser.mathml'}) {    if ($ENV{'browser.mathml'}) {
     $request->content_type('text/xml');      $request->content_type('text/xml');
   } else {    } else {
     $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;
   
 ##  $request->print(&Apache::lontexconvert::header());  
   
 ##  $request->print('<body bgcolor="#FFFFFF">'."\n");  
   
   if ($target eq 'tex') {  
   
   
   
   } else {  
          $request->print(&Apache::lontexconvert::header());  
          $request->print('<body bgcolor="#FFFFFF">'."\n");  
   }  
   
   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);
   }    }
   $request->print($result);  
   
   
 ##  $request->print('</body>');  #
   if ($target eq 'tex') {  # Edit action? Insert editing commands
 #    $request->print('\end{document}'."\n");  #
   } else {    unless ($ENV{'request.state'} eq 'published') {
     $request->print('</body>');        $result=&inserteditinfo($result,$filecontents);
     $request->print(&Apache::lontexconvert::footer());  
   }    }
 ##  $request->print(&Apache::lontexconvert::footer());  
     $request->print($result);
   
   writeallows($request->uri);    writeallows($request->uri);
   return OK;    return OK;
 }  }
     
 $Apache::lonxml::debug=0;  
 sub debug {  sub debug {
   if ($Apache::lonxml::debug eq 1) {    if ($Apache::lonxml::debug eq 1) {
     print "DEBUG:".$_[0]."<br />\n";      print "DEBUG:".$_[0]."<br />\n";
Line 479  sub debug { Line 711  sub debug {
 }  }
   
 sub error {  sub error {
   if ($Apache::lonxml::debug eq 1) {    if (($Apache::lonxml::debug eq 1) || ($ENV{'request.state'} eq 'construct') ) {
     print "<b>ERROR:</b>".$_[0]."<br />\n";      print "<b>ERROR:</b>".$_[0]."<br />\n";
   } else {    } else {
     print "<b>An Error occured while processing this resource. The instructor has been notified.</b> <br />";      print "<b>An Error occured while processing this resource. The instructor has been notified.</b> <br />";
Line 493  sub error { Line 725  sub error {
  &Apache::lonmsg::user_normal_msg($user,$domain,"Error in $ENV{'request.filename'}",$_[0]);   &Apache::lonmsg::user_normal_msg($user,$domain,"Error in $ENV{'request.filename'}",$_[0]);
       }        }
     }      }
       
     #FIXME probably shouldn't have me get everything forever.      #FIXME probably shouldn't have me get everything forever.
     &Apache::lonmsg::user_normal_msg('albertel','msu',"Error in $ENV{'request.filename'}",$_[0]);      &Apache::lonmsg::user_normal_msg('albertel','msu',"Error in $ENV{'request.filename'}",$_[0]);
     #&Apache::lonmsg::user_normal_msg('albertel','103',"Error in $ENV{'request.filename'}",$_[0]);         #&Apache::lonmsg::user_normal_msg('albertel','103',"Error in $ENV{'request.filename'}",$_[0]);
   }    }
 }  }
   
 sub warning {  sub warning {
   if ($Apache::lonxml::debug eq 1) {    if ($ENV{'request.state'} eq 'construct') {
     print "<b>W</b>ARNING<b>:</b>".$_[0]."<br />\n";      print "<b>W</b>ARNING<b>:</b>".$_[0]."<br />\n";
   }    }
 }  }
   
   sub get_param {
     my ($param,$parstack,$safeeval,$context) = @_;
     if ( ! $context ) { $context = -1; }
     my $args ='';
     if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; }
     return &Apache::run::run("{$args;".'return $'.$param.'}',$safeeval); #'
   }
   
   sub register_insert {
     my @data = split /\n/, &Apache::lonnet::getfile('/home/httpd/lonTabs/insertlist.tab');
     my $i;
     my $tagnum=0;
     my @order;
     for ($i=0;$i < $#data; $i++) {
       my $line = $data[$i];
       if ( $line =~ /^\#/ || $line =~ /^\s*\n/) { next; }
       if ( $line =~ /TABLE/ ) { last; }
       my ($tag,$descrip,$function,$show) = split(/,/, $line);
       $insertlist{"$tagnum.tag"} = $tag;
       $insertlist{"$tagnum.description"} = $descrip;
       $insertlist{"$tagnum.function"} = $function;
       $insertlist{"$tagnum.show"}= $show;
       $tagnum++;
     }
     $i++; #skipping TABLE line
     $tagnum = 0;
     for (;$i < $#data;$i++) {
       my $line = $data[$i];
       my ($mnemonic,@which) = split(/ +/,$line);
       my $tag = $insertlist{"$tagnum.tag"};
       for (my $j=0;$j <$#which;$j++) {
         if ( $which[$j] eq 'Y' ) {
    if ($insertlist{"$j.show"} ne 'no') {
     push(@{ $insertlist{"$tag.which"} },$j);
    }
         }
       }
       $tagnum++;
     }
   }
 1;  1;
 __END__  __END__
   
   

Removed from v.1.63  
changed lines
  Added in v.1.84


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