--- loncom/interface/lonhelp.pm 2005/03/22 16:49:02 1.17 +++ loncom/interface/lonhelp.pm 2006/03/18 13:22:07 1.23 @@ -37,26 +37,26 @@ use Apache::lonacc(); use Apache::lontexconvert(); use Apache::lonnavmaps; # for advancedUser use Apache::lonlocal; +use Apache::lonnet; use tth(); use GDBM_File(); # This sub takes the name of a label in, and converts it to something # that is a valid anchor name. -sub processLabelName -{ + +sub processLabelName { my ($name) = @_; $name =~ tr/a-zA-Z0-9/_/cs; return $name; } -# Serve out the Tex -sub serveTex -{ - my ($tex, $r) = @_; +# 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 $header=&mt('LON-CAPA Help'); - my $footer=&mt('About LON-CAPA help and More Help'); $r->print(< @@ -68,29 +68,31 @@ $html HEADER - $r->print($tex); + $r->print($text); - if (Apache::lonnavmaps::advancedUser()) { -$r->print(<print(< -
-
$footer
+
+$search:
+$about - +$htmlend FOOTER -} else { - $r->print(<print(< - -FOOTER -} +$htmlend +ENDBODY + } } # Render takes a tex fragment, transforms it for TtH, and returns the # HTML equivalent -sub render -{ +sub render { my ($tex, $docroot, $serverroot) = @_; tie (my %fragmentLabels, 'GDBM_File', $docroot . '/adm/help/fragmentLabels.gdbm', 0, 0); @@ -108,7 +110,7 @@ sub render }; '\\begin{html}' . '\\end{html}' |gxe; @@ -141,67 +143,102 @@ sub render return $tex; } -sub handler -{ +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=) { + 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; + $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)); +} + +sub handler { my $r = shift; my $docroot = $r->dir_config('lonDocRoot'); my $serverroot = $ENV{'HTTP_HOST'}; - 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/); - &Apache::lonlocal::get_language_handle($r); - - # 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 { + my $text=''; + if ($env{'form.searchterm'}=~/\w/) { &Apache::loncommon::content_type($r,"text/html"); - &tth::tthinit(); - if ($ENV{'browser.unicode'}) { - &tth::tthoptions('-L -u1'); + $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')) + 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 { - &tth::tthoptions('-L -u0'); + &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); } $r->send_http_header; - $tex = render($tex, $docroot, $serverroot); - serveTex($tex, $r); - + &servetext($r,$text); return OK; }