--- loncom/interface/lonhelp.pm 2004/05/17 22:08:56 1.15 +++ loncom/interface/lonhelp.pm 2007/07/17 22:07:52 1.36 @@ -1,4 +1,7 @@ # The LearningOnline Network with CAPA +# +# $Id: lonhelp.pm,v 1.36 2007/07/17 22:07:52 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; @@ -37,60 +39,61 @@ use Apache::lonacc(); use Apache::lontexconvert(); use Apache::lonnavmaps; # for advancedUser 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. -sub processLabelName -{ + +sub processLabelName { my ($name) = @_; $name =~ tr/a-zA-Z0-9/_/cs; return $name; } -# Serve out the Tex -sub serveTex -{ - my ($tex, $r) = @_; - my $bugs=&Apache::loncommon::help_open_bug('Documentation'); +# Serve out the text +sub servetext { + my ($r,$text) = @_; + my $bugs=&Apache::loncommon::help_open_bug('Documentation','Report a documentation bug'); + my $morehelp;#=&Apache::loncommon::help_open_menu(undef,undef,1,undef,undef,undef,undef,'Help and Assistance Menu'); my $header=&mt('LON-CAPA Help'); - my $footer=&mt('About LON-CAPA help and More Help'); -$r->print(< - - LON-CAPA Help - - -

$header
$bugs

+ $r->print(<help logo$header
HEADER - $r->print($tex); + $r->print($text); - if (Apache::lonnavmaps::advancedUser()) { -$r->print(< -
-
$footer
- - + if (&Apache::lonnavmaps::advancedUser()) { + my $search=&mt('Search LON-CAPA help'); + my $query=&mt('Search'); + my $uri = $r->uri; + $r->print(<
+ +
+
+$bugs +$morehelp FOOTER -} else { - $r->print(<print(< - - -FOOTER -} +ENDBODY + } # Render takes a tex fragment, transforms it for TtH, and returns the # HTML equivalent -sub render -{ - my ($tex, $docroot, $serverroot) = @_; +sub render { + my ($tex, $docroot) = @_; tie (my %fragmentLabels, 'GDBM_File', $docroot . '/adm/help/fragmentLabels.gdbm', 0, 0); # This tells TtH what to do with captions, labels, and other @@ -102,13 +105,21 @@ sub render # absolute paths for use with help.loncapa.org $tex =~ s| \\ref\{([^}]*)\} | - if (not(exists($fragmentLabels{$1}))) { - &Apache::lonnet::logthis("ERROR: $1 not a valid help label"); - }; - '\\begin{html}' . + my $label=$1; + if ($1!~/\.hlp$/) { + if ((!exists($fragmentLabels{$1})) && ($1!~/\.hlp$/)) { + &Apache::lonnet::logthis("ERROR: $1 not a valid help label"); + $label='Error'; + } else { + $label=substr($fragmentLabels{$1}, 0, -4); + } + } else { + $label=~s/\.hlp$//; + } + '\\begin{html}' . '\\end{html}' |gxe; @@ -117,12 +128,12 @@ sub render # Figures leftover without captions $tex =~ s| \\includegraphics(\[[^]]*\])*\{([^}]*)\} - | '\\begin{html}\\end{html}' |gxe; - $tex=&Apache::lontexconvert::converted(\$tex); + $tex=&Apache::lontexconvert::tth_converted(\$tex); # Finish backslashes $tex =~ s/###BACKSLASH###/'\\'/ge; @@ -134,72 +145,106 @@ sub render # just duck the issue... $tex =~ s/Figure 0://g; - $tex.=$Apache::lontexconvert::errorstring; + $tex.=$Apache::lontexconvert::errorstring; untie %fragmentLabels; return $tex; } -sub handler -{ +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/\/\>\;/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)),$output); +} + +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'); - } + &Apache::loncommon::content_type($r,"text/html"); + my $start_page= + &Apache::loncommon::start_page('LON-CAPA Help',undef, + {'only_body' => 1,}); + 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 { - &Apache::loncommon::content_type($r,"text/html"); - &tth::tthinit(); - if ($ENV{'browser.unicode'}) { - &tth::tthoptions('-L -u1'); - } else { - &tth::tthoptions('-L -u0'); + 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>); } + + $text = &render($tex, $docroot); } $r->send_http_header; - $tex = render($tex, $docroot, $serverroot); - serveTex($tex, $r); + $r->print($start_page); + &servetext($r,$text); + $r->print(&Apache::loncommon::end_page()); return OK; }