--- loncom/interface/lonhelp.pm 2006/03/18 13:22:07 1.23 +++ loncom/interface/lonhelp.pm 2006/12/01 21:47:25 1.34 @@ -1,4 +1,7 @@ # The LearningOnline Network with CAPA +# +# $Id: lonhelp.pm,v 1.34 2006/12/01 21:47:25 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,18 @@ 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 $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 $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

HEADER @@ -72,22 +77,24 @@ 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:
-$about - -$htmlend +
+$search: +
+
+$bugs +$morehelp FOOTER - } else { - $r->print(<print(< - -$htmlend + $end_page ENDBODY - } + } # Render takes a tex fragment, transforms it for TtH, and returns the @@ -105,13 +112,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}' . + '">' . '\\end{html}' |gxe; @@ -120,7 +135,7 @@ sub render { # Figures leftover without captions $tex =~ s| \\includegraphics(\[[^]]*\])*\{([^}]*)\} - | '\\begin{html}\\end{html}' |gxe; @@ -137,19 +152,20 @@ sub render { # just duck the issue... $tex =~ s/Figure 0://g; - $tex.=$Apache::lontexconvert::errorstring; + $tex.=$Apache::lontexconvert::errorstring; untie %fragmentLabels; return $tex; } sub listmatches { - my ($docroot,$term) =@_; + my ($docroot,$term,$subdir) =@_; + unless ($subdir) { $subdir=''; } my $output=''; - opendir(DIR,$docroot.'/adm/help/tex/'); + opendir(DIR,$docroot.'/adm/help/tex/'.$subdir); foreach my $filename (sort readdir(DIR)) { if ($filename=~/\.tex$/) { - open(FH,$docroot.'/adm/help/tex/'.$filename); + open(FH,$docroot.'/adm/help/tex/'.$subdir.$filename); my $quote=''; while (my $line=) { if ($line=~/\Q$term\E/i) { @@ -157,6 +173,8 @@ sub listmatches { $line=~s/\{//gs; $line=~s/\}//gs; $line=~s/\\/ /gs; + $line=~s/\/\>\;/gs; $line=~s/(\Q$term\E)/\$1\<\/b\>/gsi; $quote.='
...'.$line.'...'; } @@ -167,12 +185,12 @@ sub listmatches { $title=~s/\_/ /gs; $title=~s/\.tex$//; $filename=~s/\.tex$/\.hlp/; - $output.='
  • '.$title.''.$quote.'
    • '; + $output.='
  • '.$title.''.$quote.'
    • '; } } } closedir(DIR); - return ($output?'
      '.$output.'
    ':&mt('"[_1]" not found',$term)); + return (($output?'
      '.$output.'
    ':&mt('"[_1]" not found',$term)),$output); } sub handler { @@ -182,13 +200,21 @@ 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/) { - &Apache::loncommon::content_type($r,"text/html"); - $text=&listmatches($docroot,$env{'form.searchterm'}); + ($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)); + 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 @@ -216,24 +242,7 @@ sub handler { 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); }