--- loncom/interface/lonindexer.pm	2001/12/04 15:35:39	1.25
+++ loncom/interface/lonindexer.pm	2002/01/17 13:53:45	1.32
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.25 2001/12/04 15:35:39 matthew Exp $
+# $Id: lonindexer.pm,v 1.32 2002/01/17 13:53:45 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');
-    map {
-	$_=~/(\w+)\s+([\w\s\-]+)/;
-	$language{$1}=$2;
-    } <$fh>;
-}
-
 # ----------------------------- Handling routine called via Apache and mod_perl
 sub handler {
     my $r = shift;
@@ -239,14 +233,14 @@ ENDHEADER
 	    my %achash;
 	    my $ac=0;
 	    # some initial hashes for working with data
-	    map {
+	    foreach (@Acts) {
 		my ($state,$ref)=split(/a/);
 		$ahash{$ref}=$state;
 		$achash{$ref}=$ac;
 		$ac++;
-	    } (@Acts);
+	    }
 	    # sorting through the actions and changing the tied database hash
-	    map {
+	    foreach (sort {$achash{$a}<=>$achash{$b}} (keys %ahash)) {
 		my $key=$_;
 		if ($ahash{$key} eq '1') {
 		    $hash{'store_'.$hash{'pre_'.$key.'_link'}}=
@@ -260,9 +254,9 @@ ENDHEADER
 			delete $hash{'store_'.$hash{'pre_'.$key.'_link'}};
 		    }
 		}
-	    } sort {$achash{$a}<=>$achash{$b}} (keys %ahash);
+	    }
 	    # deleting the previously cached listing
-	    map {
+	    foreach (keys %hash) {
 		if ($_ =~ /^pre_/ && $_ =~/link$/) {
 		    my $key = $_;
 		    $key =~ s/^pre_//;
@@ -270,7 +264,7 @@ ENDHEADER
 		    delete $hash{'pre_'.$key.'_title'};
 		    delete $hash{'pre_'.$key.'_link'};
 		}
-	    } keys %hash;
+	    }
 	}
 	
 # ---------------------------------------------------------------- output title
@@ -335,13 +329,13 @@ END
 	$r->print("</tr>");
 
 # ----------------- read in what directories have previously been set to "open"
-	map {
+	foreach (keys %hash) {
 	    if ($_ =~ /^diropen_status_/) {
 		my $key = $_;
 		$key =~ s/^diropen_status_//;
 		$dirs{$key} = $hash{$_};
 	    }
-	} keys %hash;
+	}
 
 	if ($ENV{'form.openuri'}) {  # take care of review and refresh options
 	    my $uri=$ENV{'form.openuri'};
@@ -457,9 +451,9 @@ sub get_list {
     $luri =~ s/\//_/g;
 
     if ($ENV{'form.attrs'} eq "Refresh") {
-	map {
+	foreach (keys %hash) {
 	    delete $hash{$_} if ($_ =~ /^dirlist_files_/);
-	    } keys %hash;
+	    }
     }
 
     if ($hash{'dirlist_files'.$luri}) {
@@ -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;
 	}
@@ -593,11 +587,11 @@ sub display_line {
 	my @file_ext = split (/\./,$listname);
 	my $curfext = $file_ext[-1];
 	# Set the icon for the file
-	my $iconname = "unknownfiletype.gif";
-	my $embstyle = &Apache::lonnet::fileembstyle($curfext);
+	my $iconname = "unknown.gif";
+	my $embstyle = &Apache::loncommon::fileembstyle($curfext);
 	# The unless conditional that follows is a bit of overkill
 	$iconname = $curfext.".gif" unless
-	    (!defined($embstyle) || $embstyle eq 'hdn');
+	    (!defined($embstyle) || $embstyle eq 'unk' || $embstyle eq 'hdn');
 	#
 	my $filelink = $startdir.$filecom[0];
 	$r->print("<tr><td nowrap valign='bottom' bgcolor=$fileclr>");
@@ -689,7 +683,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");
@@ -753,27 +747,27 @@ sub begin_form {
 
 # ----------- grab unprocessed CGI variables that may have been appended to URL
 sub get_unprocessed_cgi {
-    map {
+    foreach (split(/&/,$ENV{'QUERY_STRING'})) {
        my ($name, $value) = split(/=/,$_);
        $value =~ tr/+/ /;
        $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
        if ($name eq 'catalogmode' or $name eq 'launch' or $name eq 'acts') {
            $ENV{'form.'.$name}=$value;
        }
-    } (split(/&/,$ENV{'QUERY_STRING'}));
+    }
 }
 
 # --------- settings whenever the user causes the indexer window to be launched
 sub start_fresh_session {
     delete $hash{'mode_catalog'};
-    map {
+    foreach (keys %hash) {
 	if ($_ =~ /^pre_/) {
 	    delete $hash{$_};
 	}
 	if ($_ =~ /^store/) {
 	    delete $hash{$_};
 	}
-    } keys %hash;    
+    }
 }
 
 1;