--- loncom/interface/lonhelp.pm 2006/03/15 23:41:49 1.21 +++ loncom/interface/lonhelp.pm 2006/06/26 22:22:00 1.28 @@ -1,4 +1,7 @@ # The LearningOnline Network with CAPA +# +# $Id: lonhelp.pm,v 1.28 2006/06/26 22:22:00 albertel Exp $ +# # .tex help system web server handler # # Copyright Michigan State University Board of Trustees @@ -24,8 +27,7 @@ # http://www.lon-capa.org/ # # .tex file help handler -# YEAR=2002 -# 7/4 Jeremy Bowers + package Apache::lonhelp; @@ -40,6 +42,9 @@ use Apache::lonlocal; use Apache::lonnet; use tth(); use GDBM_File(); +use lib '/home/httpd/lib/perl/'; +use LONCAPA; + # This sub takes the name of a label in, and converts it to something # that is a valid anchor name. @@ -53,18 +58,17 @@ sub processLabelName { # Serve out the text sub servetext { my ($r,$text) = @_; - my $html=&Apache::lonxml::xmlbegin(); - my $htmlend=&Apache::lonxml::xmlend(); my $bugs=&Apache::loncommon::help_open_bug('Documentation'); + my $start_page= + &Apache::loncommon::start_page('LON-CAPA Help',undef, + {'only_body' => 1,}); + my $end_page= + &Apache::loncommon::end_page(); my $header=&mt('LON-CAPA Help'); $r->print(< - LON-CAPA Help - - -

$header
$bugs

+ $start_page +

help logo$header

$bugs HEADER @@ -73,20 +77,23 @@ HEADER if (&Apache::lonnavmaps::advancedUser()) { my $search=&mt('Search LON-CAPA help'); my $about=&mt('About LON-CAPA help and More Help'); + my $query=&mt('Search'); + my $uri = $r->uri; $r->print(< -
-$search:
+
+$search: +
+
$about - -$htmlend FOOTER + } + $r->print(< - -$htmlend + $end_page ENDBODY + } # Render takes a tex fragment, transforms it for TtH, and returns the @@ -142,6 +149,41 @@ sub render { return $tex; } +sub listmatches { + my ($docroot,$term,$subdir) =@_; + unless ($subdir) { $subdir=''; } + my $output=''; + opendir(DIR,$docroot.'/adm/help/tex/'.$subdir); + foreach my $filename (sort readdir(DIR)) { + if ($filename=~/\.tex$/) { + open(FH,$docroot.'/adm/help/tex/'.$subdir.$filename); + my $quote=''; + while (my $line=) { + if ($line=~/\Q$term\E/i) { + $line=~s/\\\w+//gs; + $line=~s/\{//gs; + $line=~s/\}//gs; + $line=~s/\\/ /gs; + $line=~s/(\Q$term\E)/\$1\<\/b\>/gsi; + $line=~s/\/\>\;/gs; + $quote.='
...'.$line.'...'; + } + } + close(FH); + if ($quote) { + my $title=$filename; + $title=~s/\_/ /gs; + $title=~s/\.tex$//; + $filename=~s/\.tex$/\.hlp/; + $output.='
  • '.$title.''.$quote.'
    • '; + } + } + } + closedir(DIR); + return (($output?'
      '.$output.'
    ':&mt('"[_1]" not found',$term)),$output); +} + sub handler { my $r = shift; @@ -149,57 +191,50 @@ sub handler { my $serverroot = $ENV{'HTTP_HOST'}; &Apache::lonlocal::get_language_handle($r); + &Apache::loncommon::content_type($r,"text/html"); my $text=''; if ($env{'form.searchterm'}=~/\w/) { + ($text,my $matches)=&listmatches($docroot,$env{'form.searchterm'},&Apache::lonlocal::current_language().'/'); + if ($matches) { + my ($englishresult,$englishmatches)=&listmatches($docroot,$env{'form.searchterm'}); + if ($englishmatches) { + $text.='
    '.$englishresult; + } + } else { + $text=&listmatches($docroot,$env{'form.searchterm'}); + } } else { - my $filenames = &Apache::lonnet::unescape(substr ($ENV{'REQUEST_URI'} , - rindex($ENV{'REQUEST_URI'}, '/') + 1, -4)); - - # Security check on the file; the whole filename must consist - # of nothing but alphanums, ' ,, or ., or the file - # will be "not found", no matter what. - - return HTTP_NOT_FOUND if ($filenames !~ /\A[-0-9a-zA-z_'',:.]+\Z/); - - # Join together the tex files, return HTTP_NOT_FOUND if any of - # them are not found - my $tex = ''; - # Since in insertlist.tab I want to specify multiple files, - # and insertlist.tab also uses commas, I need something else - # so replace : with , - $filenames =~ s/:/,/g; - my @files = split(/,/, $filenames); - - for my $filename (@files) { - if (-e $docroot.'/adm/help/tex/'. - &Apache::lonlocal::current_language().'/'. - $filename.'.tex') { - $filename=&Apache::lonlocal::current_language().'/'.$filename; - } - (my $file = Apache::File->new($docroot - . '/adm/help/tex/'.$filename.'.tex')) + my $filenames = &unescape(substr ($ENV{'REQUEST_URI'} , + rindex($ENV{'REQUEST_URI'}, '/') + 1, -4)); + + # Security check on the file; the whole filename must consist + # of nothing but alphanums, ' ,, or ., or the file + # will be "not found", no matter what. + + return HTTP_NOT_FOUND if ($filenames !~ /\A[-0-9a-zA-z_'',:.]+\Z/); + + # Join together the tex files, return HTTP_NOT_FOUND if any of + # them are not found + my $tex = ''; + # Since in insertlist.tab I want to specify multiple files, + # and insertlist.tab also uses commas, I need something else + # so replace : with , + $filenames =~ s/:/,/g; + my @files = split(/,/, $filenames); + + for my $filename (@files) { + if (-e $docroot.'/adm/help/tex/'. + &Apache::lonlocal::current_language().'/'. + $filename.'.tex') { + $filename=&Apache::lonlocal::current_language().'/'.$filename; + } + (my $file = Apache::File->new($docroot + . '/adm/help/tex/'.$filename.'.tex')) or return HTTP_NOT_FOUND; $tex .= join('', <$file>); - } + } - if ($env{'browser.mathml'}) { - &Apache::loncommon::content_type($r,'text/xml'); - &tth::ttminit(); - if ($env{'browser.unicode'}) { - &tth::ttmoptions('-L -u1'); - } else { - &tth::ttmoptions('-L -u0'); - } - } else { - &Apache::loncommon::content_type($r,"text/html"); - &tth::tthinit(); - if ($env{'browser.unicode'}) { - &tth::tthoptions('-L -u1'); - } else { - &tth::tthoptions('-L -u0'); - } - } - $text = &render($tex, $docroot, $serverroot); + $text = &render($tex, $docroot, $serverroot); } $r->send_http_header;