--- loncom/interface/lonindexer.pm	2001/12/11 03:50:09	1.27
+++ loncom/interface/lonindexer.pm	2002/01/17 14:10:44	1.34
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.27 2001/12/11 03:50:09 harris41 Exp $
+# $Id: lonindexer.pm,v 1.34 2002/01/17 14:10:44 harris41 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,6 +40,9 @@
 # 8/14 H. K. Ng
 # 8/28,10/15,11/28,11/29 Scott Harrison
 # 11/30 Matthew Hall
+# 12/11,12/13 Scott Harrison
+# YEAR=2002
+# 1/17 Scott Harrison
 #
 ###
 
@@ -61,6 +64,7 @@ package Apache::lonindexer;
 # ------------------------------------------------- modules used by this module
 use strict;
 use Apache::lonnet();
+use Apache::loncommon();
 use Apache::Constants qw(:common);
 use Apache::File;
 use GDBM_File;
@@ -76,16 +80,6 @@ my $extrafield; # default extra table ce
 my $fnum; # file counter
 my $dnum; # directory counter
 
-# ---------------------------------------------------------------------- BEGIN
-sub BEGIN {
-    my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.
-			     '/language.tab');
-    while(<$fh>) {
-	$_=~/(\w+)\s+([\w\s\-]+)/;
-	$language{$1}=$2;
-    }
-}
-
 # ----------------------------- Handling routine called via Apache and mod_perl
 sub handler {
     my $r = shift;
@@ -489,9 +483,9 @@ sub match_ext {
 	my $fext = pop(@filecom);
 	my $fnptr = $unpackline[3]&$dirptr;
  	if ($fnptr == 0 and $unpackline[3] ne "") {
-	    my $embstyle = &Apache::lonnet::fileembstyle($fext);
+	    my $embstyle = &Apache::loncommon::fileembstyle($fext);
             push @trimlist,$line if (defined($embstyle) && 
-				     $embstyle ne 'hdn' );
+				     ($embstyle ne 'hdn' or $fext eq 'meta'));
 	} else {
 	    push @trimlist,$line;
 	}
@@ -594,7 +588,7 @@ sub display_line {
 	my $curfext = $file_ext[-1];
 	# Set the icon for the file
 	my $iconname = "unknown.gif";
-	my $embstyle = &Apache::lonnet::fileembstyle($curfext);
+	my $embstyle = &Apache::loncommon::fileembstyle($curfext);
 	# The unless conditional that follows is a bit of overkill
 	$iconname = $curfext.".gif" unless
 	    (!defined($embstyle) || $embstyle eq 'unk' || $embstyle eq 'hdn');
@@ -608,8 +602,10 @@ sub display_line {
 	    $title = &Apache::lonnet::metadata($filelink,'title')
 		if ($metafile == 1);
 	    $title=$listname unless $title;
-	    $r->print("<a href='javascript:select_data(\"",
-	              $title,'","',$filelink,"\")'>");
+	    my $titleesc=$title;
+	    $titleesc=~s/\'/\\'/;
+            $r->print("<a href=\"javascript:select_data('",
+                      $titleesc,"','",$filelink,"')\">");
 	    $r->print("<img src='",$iconpath,"select.gif' border='0' /></a>".
 		      "\n");
 	    $r->print("</td><td valign='bottom' nowrap bgcolor=$fileclr>");
@@ -689,7 +685,7 @@ sub display_line {
 	if ($hash{'display_attrs_5'} == 1) {
 	    my $lang = &Apache::lonnet::metadata($filelink,'language')
 		if ($metafile == 1);
-	    $lang = $language{$lang};
+	    $lang = &Apache::loncommon::languagedescription($lang);
 	    $lang = '&nbsp;' if (!$lang);
 	    $r->print("<td bgcolor=$fileclr valign=bottom> ".$lang.
 		      " </td>\n");