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

Diff for /loncom/interface/lonhelp.pm between versions 1.21 and 1.22

version 1.21, 2006/03/15 23:41:49 version 1.22, 2006/03/16 17:18:34
Line 81  $search: <input type="text" name="search Line 81  $search: <input type="text" name="search
     </body>      </body>
 $htmlend  $htmlend
 FOOTER  FOOTER
     }     } else {
     $r->print(<<ENDBODY);         $r->print(<<ENDBODY);
     <!-- END -->      <!-- END -->
     </body>      </body>
 $htmlend  $htmlend
 ENDBODY  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
Line 142  sub render { Line 143  sub render {
     return $tex;      return $tex;
 }  }
   
   sub listmatches {
       my ($docroot,$term) =@_;
       my $output='';
       opendir(DIR,$docroot.'/adm/help/tex/');
       foreach my $filename (sort readdir(DIR)) {
    if ($filename=~/\.tex$/) {
       open(FH,$docroot.'/adm/help/tex/'.$filename);
       my $quote='';
       while (my $line=<FH>) {
    if ($line=~/\Q$term\E/i) {
       $line=~s/\\\w+//gs;
       $line=~s/\{//gs;
       $line=~s/\}//gs;
       $line=~s/\\/ /gs;
       $line=~s/\Q$term\E/\<b\>$term\<\/b\>/gsi;
       $quote.='<br />...'.$line.'...';
    }
       }
       close(FH);
       if ($quote) {
    my $title=$filename;
                   $title=~s/\_/ /gs;
                   $title=~s/\.tex$//;
                   $filename=~s/\.tex$/\.hlp/;
    $output.='<li><a href="/adm/help/tex/'.$filename.'">'.$title.'</a>'.$quote.'</li>';
       }
    }
       }
       closedir(DIR);
       return ($output?'<ul>'.$output.'</ul>':&mt('"[_1]" not found',$term));
   }
   
 sub handler {  sub handler {
      my $r = shift;       my $r = shift;
   
Line 151  sub handler { Line 184  sub handler {
      &Apache::lonlocal::get_language_handle($r);       &Apache::lonlocal::get_language_handle($r);
      my $text='';       my $text='';
      if ($env{'form.searchterm'}=~/\w/) {       if ($env{'form.searchterm'}=~/\w/) {
    &Apache::loncommon::content_type($r,"text/html");
    $text=&listmatches($docroot,$env{'form.searchterm'});
      } else {       } else {
         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.
          
         return HTTP_NOT_FOUND if ($filenames !~ /\A[-0-9a-zA-z_'',:.]+\Z/);   return HTTP_NOT_FOUND if ($filenames !~ /\A[-0-9a-zA-z_'',:.]+\Z/);
     
         # Join together the tex files, return HTTP_NOT_FOUND if any of   # Join together the tex files, return HTTP_NOT_FOUND if any of
         # them are not found   # them are not found
         my $tex = '';   my $tex = '';
         # Since in insertlist.tab I want to specify multiple files,   # Since in insertlist.tab I want to specify multiple files,
         # and insertlist.tab also uses commas, I need something else   # and insertlist.tab also uses commas, I need something else
         # so replace : with ,   # so replace : with ,
         $filenames =~ s/:/,/g;   $filenames =~ s/:/,/g;
         my @files = split(/,/, $filenames);   my @files = split(/,/, $filenames);
          
         for my $filename (@files) {   for my $filename (@files) {
     if (-e $docroot.'/adm/help/tex/'.       if (-e $docroot.'/adm/help/tex/'.
         &Apache::lonlocal::current_language().'/'.   &Apache::lonlocal::current_language().'/'.
         $filename.'.tex') {   $filename.'.tex') {
         $filename=&Apache::lonlocal::current_language().'/'.$filename;   $filename=&Apache::lonlocal::current_language().'/'.$filename;
     }       }
     (my $file = Apache::File->new($docroot       (my $file = Apache::File->new($docroot
      . '/adm/help/tex/'.$filename.'.tex'))     . '/adm/help/tex/'.$filename.'.tex'))
          or return HTTP_NOT_FOUND;           or return HTTP_NOT_FOUND;
      $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');
    }       }
         } 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');
    }       }
         }   }
         $text = &render($tex, $docroot, $serverroot);   $text = &render($tex, $docroot, $serverroot);
      }       }
   
      $r->send_http_header;       $r->send_http_header;
Removed from v.1.21  
changed lines
  Added in v.1.22

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