--- loncom/interface/lonindexer.pm	2001/11/28 16:47:25	1.23
+++ loncom/interface/lonindexer.pm	2001/12/04 18:35:47	1.26
@@ -1,7 +1,30 @@
 # The LearningOnline Network with CAPA
-#
 # Directory Indexer
 #
+# $Id: lonindexer.pm,v 1.26 2001/12/04 18:35:47 matthew Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
 # YEAR=1999
 # 5/21/99, 5/22,5/25,5/26,5/31,6/2,6/10,7/12,7/14 Gerd Kortemeyer)
 # 11/23 Gerd Kortemeyer
@@ -15,9 +38,9 @@
 # 6/26,7/8 H. K. Ng
 # 8/6,8/7,8/10 Scott Harrison
 # 8/14 H. K. Ng
-# 8/28,10/15,11/28 Scott Harrison
+# 8/28,10/15,11/28,11/29 Scott Harrison
+# 11/30 Matthew Hall
 #
-# $Id: lonindexer.pm,v 1.23 2001/11/28 16:47:25 harris41 Exp $
 ###
 
 ###############################################################################
@@ -456,16 +479,6 @@ sub match_ext {
     my @fileext;
     my $dirptr=16384;
 
-    my $tabdir  = $r->dir_config('lonTabDir');
-    my $fn = $tabdir.'/filetypes.tab';
-    if (-e $fn) {
-	my $FH=Apache::File->new($fn);
-	my @content=<$FH>;
-	foreach my $line (@content) {
-	    (my $ext,my $foo) = split /\s+/,$line;
-	    push @fileext,$ext;
-	}
-    }
     foreach my $line (@packlist) {
 	chomp $line;
 	$line =~ s/^\/home\/httpd\/html//;
@@ -476,9 +489,9 @@ sub match_ext {
 	my $fext = pop(@filecom);
 	my $fnptr = $unpackline[3]&$dirptr;
  	if ($fnptr == 0 and $unpackline[3] ne "") {
-	    foreach my $nextline (@fileext) {
-		push @trimlist,$line if $nextline eq $fext;
-	    }
+	    my $embstyle = &Apache::lonnet::fileembstyle($fext);
+            push @trimlist,$line if (defined($embstyle) && 
+				     $embstyle ne 'hdn' );
 	} else {
 	    push @trimlist,$line;
 	}
@@ -578,7 +591,14 @@ sub display_line {
 # display file
     if ($fnptr == 0 and $filecom[3] ne "") {
 	my @file_ext = split (/\./,$listname);
-	my $curfext = $file_ext[scalar(@file_ext)-1];
+	my $curfext = $file_ext[-1];
+	# Set the icon for the file
+	my $iconname = "unknown.gif";
+	my $embstyle = &Apache::lonnet::fileembstyle($curfext);
+	# The unless conditional that follows is a bit of overkill
+	$iconname = $curfext.".gif" unless
+	    (!defined($embstyle) || $embstyle eq 'unk' || $embstyle eq 'hdn');
+	#
 	my $filelink = $startdir.$filecom[0];
 	$r->print("<tr><td nowrap valign='bottom' bgcolor=$fileclr>");
 	my $metafile = grep /^$filecom[0]\.meta\&/, @list;
@@ -632,7 +652,7 @@ sub display_line {
 		      ".gif border='0' />\n") if $rem > 0;
 	}
 
-	$r->print("<img src=$iconpath$curfext.gif border='0' />\n");
+	$r->print("<img src=$iconpath$iconname border='0' />\n");
 	$r->print (" <a href=\"javascript:openWindow('".$filelink.
 		   "', 'metadatafile', '450', '500', 'no', 'yes')\";".
 		   " TARGET=_self>$listname</a> ");