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

Diff for /loncom/interface/lonhelp.pm between versions 1.17 and 1.20

version 1.17, 2005/03/22 16:49:02 version 1.20, 2006/03/15 21:55:58
Line 37  use Apache::lonacc(); Line 37  use Apache::lonacc();
 use Apache::lontexconvert();  use Apache::lontexconvert();
 use Apache::lonnavmaps; # for advancedUser  use Apache::lonnavmaps; # for advancedUser
 use Apache::lonlocal;  use Apache::lonlocal;
   use Apache::lonnet;
 use tth();  use tth();
 use GDBM_File();  use GDBM_File();
   
 # This sub takes the name of a label in, and converts it to something  # This sub takes the name of a label in, and converts it to something
 # that is a valid anchor name.  # that is a valid anchor name.
 sub processLabelName   
 {  sub processLabelName {
     my ($name) = @_;      my ($name) = @_;
     $name =~ tr/a-zA-Z0-9/_/cs;      $name =~ tr/a-zA-Z0-9/_/cs;
     return $name;      return $name;
 }  }
   
 # Serve out the Tex  # Serve out the text
 sub serveTex  sub servetext {
 {      my ($r,$text) = @_;
     my ($tex, $r) = @_;  
     my $html=&Apache::lonxml::xmlbegin();      my $html=&Apache::lonxml::xmlbegin();
       my $htmlend=&Apache::lonxml::xmlend();
     my $bugs=&Apache::loncommon::help_open_bug('Documentation');      my $bugs=&Apache::loncommon::help_open_bug('Documentation');
     my $header=&mt('LON-CAPA Help');      my $header=&mt('LON-CAPA Help');
     my $footer=&mt('About LON-CAPA help and More Help');  
     $r->print(<<HEADER);      $r->print(<<HEADER);
 $html  $html
     <head>      <head>
Line 68  $html Line 68  $html
     <!-- BEGIN -->      <!-- BEGIN -->
 HEADER  HEADER
   
     $r->print($tex);      $r->print($text);
   
     if (Apache::lonnavmaps::advancedUser()) {      if (&Apache::lonnavmaps::advancedUser()) {
 $r->print(<<FOOTER);   my $search=&mt('Search LON-CAPA help');
    my $about=&mt('About LON-CAPA help and More Help');
    $r->print(<<FOOTER);
     <!-- END -->      <!-- END -->
     <hr />      <hr /><form method="post">
     <center><font size="-1"><a href="/adm/help/abouthelp.html">$footer</a></font></center>  $search: <input type="text" name="searchterm" size="40" /><br />
   <a href="/adm/help/abouthelp.html">$about</a>
     </body>      </body>
 </html>  $htmlend
 FOOTER  FOOTER
 } else {      }
     $r->print(<<FOOTER);      $r->print(<<ENDBODY);
     <!-- END -->      <!-- END -->
     </body>      </body>
 </html>  $htmlend
 FOOTER  ENDBODY
 }  
 }  }
   
 # Render takes a tex fragment, transforms it for TtH, and returns the  # Render takes a tex fragment, transforms it for TtH, and returns the
 # HTML equivalent  # HTML equivalent
 sub render   sub render {
 {  
     my ($tex, $docroot, $serverroot) = @_;      my ($tex, $docroot, $serverroot) = @_;
     tie (my %fragmentLabels, 'GDBM_File', $docroot . '/adm/help/fragmentLabels.gdbm', 0, 0);      tie (my %fragmentLabels, 'GDBM_File', $docroot . '/adm/help/fragmentLabels.gdbm', 0, 0);
   
Line 108  sub render Line 109  sub render
               };                };
              '\\begin{html}<a href="http://' . $serverroot ."/adm/help/".               '\\begin{html}<a href="http://' . $serverroot ."/adm/help/".
               substr($fragmentLabels{$1}, 0, -4) .                substr($fragmentLabels{$1}, 0, -4) .
               '.hlp#' . processLabelName($1) .                 '.hlp#' . &processLabelName($1) . 
              '"><img src="http://' . $serverroot . '/adm/help/gif/smallHelp.gif" border="0" /></a>' .               '"><img src="http://' . $serverroot . '/adm/help/gif/smallHelp.gif" border="0" /></a>' .
              '\\end{html}'               '\\end{html}'
              |gxe;               |gxe;
Line 141  sub render Line 142  sub render
     return $tex;      return $tex;
 }  }
   
 sub handler  sub handler {
 {  
      my $r = shift;       my $r = shift;
   
      my $docroot = $r->dir_config('lonDocRoot');       my $docroot = $r->dir_config('lonDocRoot');
Line 150  sub handler Line 150  sub handler
   
      my $filenames = &Apache::lonnet::unescape(substr ($ENV{'REQUEST_URI'} ,        my $filenames = &Apache::lonnet::unescape(substr ($ENV{'REQUEST_URI'} , 
     rindex($ENV{'REQUEST_URI'}, '/') + 1, -4));      rindex($ENV{'REQUEST_URI'}, '/') + 1, -4));
        
      # Security check on the file; the whole filename must consist       # Security check on the file; the whole filename must consist
      # of nothing but alphanums, ' ,, or ., or the file       # of nothing but alphanums, ' ,, or ., or the file
      # will be "not found", no matter what.       # will be "not found", no matter what.
Line 180  sub handler Line 180  sub handler
  $tex .= join('', <$file>);   $tex .= join('', <$file>);
      }       }
   
      if ($ENV{'browser.mathml'}) {       if ($env{'browser.mathml'}) {
  &Apache::loncommon::content_type($r,'text/xml');   &Apache::loncommon::content_type($r,'text/xml');
  &tth::ttminit();   &tth::ttminit();
  if ($ENV{'browser.unicode'}) {   if ($env{'browser.unicode'}) {
      &tth::ttmoptions('-L -u1');       &tth::ttmoptions('-L -u1');
  } else {   } else {
      &tth::ttmoptions('-L -u0');       &tth::ttmoptions('-L -u0');
Line 191  sub handler Line 191  sub handler
      } else {       } else {
  &Apache::loncommon::content_type($r,"text/html");   &Apache::loncommon::content_type($r,"text/html");
  &tth::tthinit();   &tth::tthinit();
  if ($ENV{'browser.unicode'}) {   if ($env{'browser.unicode'}) {
      &tth::tthoptions('-L -u1');       &tth::tthoptions('-L -u1');
  } else {   } else {
      &tth::tthoptions('-L -u0');       &tth::tthoptions('-L -u0');
Line 199  sub handler Line 199  sub handler
      }       }
   
      $r->send_http_header;       $r->send_http_header;
      $tex = render($tex, $docroot, $serverroot);       my $text = &render($tex, $docroot, $serverroot);
      serveTex($tex, $r);       &servetext($r,$text);
   
      return OK;       return OK;
 }  }
   
Removed from v.1.17  
changed lines
  Added in v.1.20

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