--- loncom/interface/lonhelp.pm	2006/03/19 23:09:20	1.24
+++ loncom/interface/lonhelp.pm	2006/07/14 17:05:21	1.31
@@ -1,4 +1,7 @@
 # The LearningOnline Network with CAPA
+#
+# $Id: lonhelp.pm,v 1.31 2006/07/14 17:05:21 www 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,7 +58,8 @@ sub processLabelName {
 # Serve out the text
 sub servetext {
     my ($r,$text) = @_;
-    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,});
@@ -62,8 +68,8 @@ sub servetext {
     my $header=&mt('LON-CAPA Help');
     $r->print(<<HEADER);
     $start_page
-    <h3 style="font: sans-serif"><img align="right"
-    src="/adm/help/gif/lonhelpheader.gif"/>$header<hr />$bugs</h3>
+    <h3 style="font: sans-serif"><img align="right" alt="help logo"
+    src="/adm/help/gif/lonhelpheader.gif"/>$header</h3><hr />
     <!-- BEGIN -->
 HEADER
 
@@ -71,12 +77,15 @@ 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(<<FOOTER);
-    <hr /><form method="post">
-$search: <input type="text" name="searchterm" size="40" /><br />
-<a href="/adm/help/abouthelp.html">$about</a>
+    <hr /><form action="$uri" method="post">
+$search: <input type="text" name="searchterm" size="40" /><input type="submit" value="$query" />
+</form>
+<br />
+$bugs
+$morehelp
 FOOTER
  
     }
@@ -103,11 +112,19 @@ 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");
-              };
+              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}<a href="http://' . $serverroot ."/adm/help/".
-              substr($fragmentLabels{$1}, 0, -4) .
+              $label .
               '.hlp#' . &processLabelName($1) . 
              '"><img src="http://' . $serverroot . '/adm/help/gif/smallHelp.gif" border="0" /></a>' .
              '\\end{html}'
@@ -142,12 +159,13 @@ sub render {
 }
 
 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=<FH>) {
 		if ($line=~/\Q$term\E/i) {
@@ -155,6 +173,8 @@ sub listmatches {
 		    $line=~s/\{//gs;
 		    $line=~s/\}//gs;
 		    $line=~s/\\/ /gs;
+                    $line=~s/\</\&lt\;/gs;
+                    $line=~s/\>/\&gt\;/gs;
 		    $line=~s/(\Q$term\E)/\<b\>$1\<\/b\>/gsi;
 		    $quote.='<br />...'.$line.'...';
 		}
@@ -165,12 +185,12 @@ sub listmatches {
                 $title=~s/\_/ /gs;
                 $title=~s/\.tex$//;
                 $filename=~s/\.tex$/\.hlp/;
-		$output.='<li><a href="/adm/help/tex/'.$filename.'">'.$title.'</a>'.$quote.'</li>';
+		$output.='<li><a href="/adm/help/tex/'.$subdir.$filename.'">'.$title.'</a>'.$quote.'</li>';
 	    }
 	}
     }
     closedir(DIR);
-    return ($output?'<ul>'.$output.'</ul>':&mt('"[_1]" not found',$term));
+    return (($output?'<ul>'.$output.'</ul>':&mt('"[_1]" not found',$term)),$output);
 }
 
 sub handler {
@@ -180,12 +200,20 @@ 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.='<hr />'.$englishresult;
+             }
+         } else {
+             $text=&listmatches($docroot,$env{'form.searchterm'}); 
+         }
      } else {
-	 my $filenames = &Apache::lonnet::unescape(substr ($ENV{'REQUEST_URI'} , 
+	 my $filenames = &unescape(substr ($ENV{'REQUEST_URI'} , 
 							   rindex($ENV{'REQUEST_URI'}, '/') + 1, -4));
 	 
 	 # Security check on the file; the whole filename must consist
@@ -214,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);
      }