--- loncom/interface/lonindexer.pm	2002/03/25 19:27:17	1.40
+++ loncom/interface/lonindexer.pm	2003/02/20 19:41:26	1.61
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.40 2002/03/25 19:27:17 matthew Exp $
+# $Id: lonindexer.pm,v 1.61 2003/02/20 19:41:26 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,15 +34,11 @@
 # 05/9-05/19/2001 H. K. Ng
 # 05/21/2001 H. K. Ng
 # 05/23/2001 H. K. Ng
-# 5/31,6/1,6/2,6/15 Scott Harrison
 # 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,11/29 Scott Harrison
 # 11/30 Matthew Hall
-# 12/11,12/13 Scott Harrison
 # YEAR=2002
-# 1/17 Scott Harrison
+# 6/29/2002 H. K. Ng
 #
 ###
 
@@ -81,7 +77,7 @@ my $fnum; # file counter
 my $dnum; # directory counter
 
 # ----- Used to include or exclude files with certain extensions.
-my @Only = (); 
+my @Only = ();
 my @Omit = ();
 
 
@@ -89,12 +85,18 @@ my @Omit = ();
 sub handler {
     my $r = shift;
     $r->content_type('text/html');
+    &Apache::loncommon::no_cache($r);
     $r->send_http_header;
     return OK if $r->header_only;
     $fnum=0;
     $dnum=0;
     untie %hash;
 
+    # Deal with stupid global variables (is there a way around making
+    # these global to this package?  It is just so wrong....)
+    undef (@Only);
+    undef (@Omit);
+
 # ------------------------------------- read in machine configuration variables
     my $iconpath= $r->dir_config('lonIconsURL') . "/";
     my $domain  = $r->dir_config('lonDefDomain');
@@ -124,22 +126,15 @@ sub handler {
     my $diropendb = 
 	"/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db";
 
-    if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT,0640)) {
+    if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) {
 	if ($ENV{'form.launch'} eq '1') {
 	    &start_fresh_session();
-	}
-
+        }
 # -------------------- refresh environment with user database values (in %hash)
-	if ($hash{'mode_catalog'} eq 'interactive') {
-	    $ENV{'form.catalogmode'}='interactive';
-	}
-	if ($hash{'mode_catalog'} eq 'groupimport') {
-	    $ENV{'form.catalogmode'}='groupimport';
-	}
+	&setvalues(\%hash,'form.catalogmode',\%ENV,'form.catalogmode'   );
 
 # --------------------- define extra fields and buttons in case of special mode
 	if ($ENV{'form.catalogmode'} eq 'interactive') {
-	    $hash{'mode_catalog'}='interactive';
 	    $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
 		'<a name="$anchor"><img src="'.$iconpath.'whitespace1.gif"'.
 		' border="0" /></td>';
@@ -149,7 +144,6 @@ sub handler {
 END
         }
 	elsif ($ENV{'form.catalogmode'} eq 'groupimport') {
-	    $hash{'mode_catalog'}='groupimport';
 	    $extrafield='<td bgcolor="'.$fileclr.'" valign="bottom">'.
 		'<a name="$anchor"><img src="'.$iconpath.'whitespace1.gif"'.
 		' border="0" /></td>';
@@ -171,11 +165,11 @@ END
 	# $element is the name of the element in $formname which receives
 	#       the URL.
 	# &Apache::lonxml::debug('Checking mode, form, element');
-	&setvalues(\%hash,'form_mode'   ,\%ENV,'form.mode'   );
-	&setvalues(\%hash,'form_form'   ,\%ENV,'form.form'   );
-	&setvalues(\%hash,'form_element',\%ENV,'form.element');
-	&setvalues(\%hash,'form_only'   ,\%ENV,'form.only'   );
-	&setvalues(\%hash,'form_omit'   ,\%ENV,'form.omit'   );
+	&setvalues(\%hash,'form.mode'   ,\%ENV,'form.mode'   );
+	&setvalues(\%hash,'form.form'   ,\%ENV,'form.form'   );
+	&setvalues(\%hash,'form.element',\%ENV,'form.element');
+	&setvalues(\%hash,'form.only'   ,\%ENV,'form.only'   );
+	&setvalues(\%hash,'form.omit'   ,\%ENV,'form.omit'   );
 
         # Deal with 'omit' and 'only' 
         if (exists $ENV{'form.omit'}) {
@@ -200,8 +194,14 @@ END
 	    # by default (ie. if $mode is undefined).  This is the easy
 	    # way out.  Hopefully in the future I'll find a way to get 
 	    # the calls dealt with in a more comprehensive manner.
+
+#
+# There is now also mode "simple", which is for the simple version of the rat
+#
+#
 	    if (!defined($mode) || ($mode ne 'edit' && $mode ne 'parmset')) {
                 my $location = "/adm/groupsort?catalogmode=groupimport&";
+                $location .= "mode=".$mode."&";
                 $location .= "acts=";
 		$catalogmodefunctions=<<"END";
 function select_data(title,url) {
@@ -322,9 +322,8 @@ function gothere(val) {
 </script>
 
 </head>
-<body bgcolor="#FFFFFF">
 ENDHEADER
-
+$r->print(&Apache::loncommon::bodytag('Browse Resources'));
 # - Evaluate actions from previous page (both cumulatively and chronologically)
         if ($ENV{'form.catalogmode'} eq 'groupimport') {
 	    my $acts=$ENV{'form.acts'};
@@ -367,38 +366,35 @@ ENDHEADER
 	    }
 	}
 	
-# ---------------------------------------------------------------- output title
-	$r->print('<h2><font color="#888888">The LearningOnline With CAPA '.
-		  'Network Directory Browser</font></h2>'."\n");
 # ---------------------------------- get state of file attributes to be showing
-	if ($ENV{'form.attrs'} ne "") {
-	    for (my $i=0; $i<=6; $i++) {
+	if ($ENV{'form.attrs'} ne '') {
+	    for (my $i=0; $i<=8; $i++) {
 		delete $hash{'display_attrs_'.$i};
 		if ($ENV{'form.attr'.$i} == 1) {
-		    $attrchk[$i] = "checked";
+		    $attrchk[$i] = 'checked';
 		    $hash{'display_attrs_'.$i} = 1;
 		}
 	    }
 	} else {
-	    for (my $i=0; $i<=6; $i++) {
-		$attrchk[$i] = "checked" if $hash{'display_attrs_'.$i} == 1;
+	    for (my $i=0; $i<=8; $i++) {
+		$attrchk[$i] = 'checked' if $hash{'display_attrs_'.$i} == 1;
 	    }
 	}
 # ------------------------------- output state of file attributes to be showing
 	$r->print(<<END);
-<b><font color="#666666">Display file attributes</font></b><br />
 <form method="post" name="fileattr" action="$uri"
  enctype="application/x-www-form-urlencoded">
+<b><font color="#666666">Display file attributes</font></b><br />
 <table border=0><tr>
-<td><input type="checkbox" name="attr0" value="1" $attrchk[0] /> Size</td>
-<td><input type="checkbox" name="attr1" value="1" $attrchk[1] /> Last access</td>
-<td><input type="checkbox" name="attr2" value="1" $attrchk[2] /> Last modified</td>
-<td><input type="checkbox" name="attr6" value="1" $attrchk[6] /> All versions</td>
-</tr><tr>
-<td><input type="checkbox" name="attr3" value="1" $attrchk[3] /> Author</td>
-<td><input type="checkbox" name="attr4" value="1" $attrchk[4] /> Keywords</td>
-<td><input type="checkbox" name="attr5" value="1" $attrchk[5] /> Language</td>
-<td>&nbsp;</td>
+<td><input type="checkbox" name="attr0" value="1" $attrchk[0] /> Title</td>
+<td><input type="checkbox" name="attr1" value="1" $attrchk[1] /> Size</td>
+<td><input type="checkbox" name="attr2" value="1" $attrchk[2] /> Last access</td>
+<td><input type="checkbox" name="attr3" value="1" $attrchk[3] /> Last modified</td>
+<td rowspan="2"><input type="checkbox" name="attr8" value="1" $attrchk[8] /> Show Resource</td></tr><tr>
+<td><input type="checkbox" name="attr4" value="1" $attrchk[4] /> Author</td>
+<td><input type="checkbox" name="attr5" value="1" $attrchk[5] /> Keywords</td>
+<td><input type="checkbox" name="attr6" value="1" $attrchk[6] /> Language</td>
+<td><input type="checkbox" name="attr7" value="1" $attrchk[7] /> All versions</td>
 </tr></table>
 <input type="hidden" name="dirPointer" value="on" />
 <input type="hidden" name="acts" value="" />
@@ -414,22 +410,26 @@ END
 #        $r->print(&initdebug());
 #        $r->print(&writedebug("Omit:@Omit")) if (@Omit);
 #        $r->print(&writedebug("Only:@Only")) if (@Only);
-        $r->print("<table width='100\%' border=0><tr><td bgcolor=#eeeeee>\n");
-	$r->print("<table width='100\%' border=0><tr>\n");
-	$r->print("<td $colspan bgcolor=$titleclr><b>Name</b></td>\n");
-	$r->print("<td bgcolor=$titleclr align=right><b>Size (bytes) ".
-		  "</b></td>\n") if ($hash{'display_attrs_0'} == 1);
-	$r->print("<td bgcolor=$titleclr><b>Last accessed</b></td>\n") 
-	    if ($hash{'display_attrs_1'} == 1);
-	$r->print("<td bgcolor=$titleclr><b>Last modified</b></td>\n")
+        $r->print("<table width='100\%' border=0><tr><td bgcolor=#777777>\n");
+	$r->print("<table width='100\%' border=0><tr bgcolor=$titleclr>\n");
+	$r->print("<td $colspan><b>Name</b></td>\n");
+	$r->print("<td><b>Title</b></td>\n") 
+	    if ($hash{'display_attrs_0'} == 1);
+	$r->print("<td align=right><b>Size (bytes) ".
+		  "</b></td>\n") if ($hash{'display_attrs_1'} == 1);
+	$r->print("<td><b>Last accessed</b></td>\n") 
 	    if ($hash{'display_attrs_2'} == 1);
-	$r->print("<td bgcolor=$titleclr><b>Author(s)</b></td>\n")
+	$r->print("<td><b>Last modified</b></td>\n")
 	    if ($hash{'display_attrs_3'} == 1);
-	$r->print("<td bgcolor=$titleclr><b>Keywords</b></td>\n")
+	$r->print("<td><b>Author(s)</b></td>\n")
 	    if ($hash{'display_attrs_4'} == 1);
-	$r->print("<td bgcolor=$titleclr><b>Language</b></td>\n")
+	$r->print("<td><b>Keywords</b></td>\n")
 	    if ($hash{'display_attrs_5'} == 1);
-	$r->print("</tr>");
+	$r->print("<td><b>Language</b></td>\n")
+	    if ($hash{'display_attrs_6'} == 1);
+	$r->print("<td><b>Resource</b></td>\n")
+	    if ($hash{'display_attrs_8'} == 1);
+	$r->print('</tr>');
 
 # ----------------- read in what directories have previously been set to "open"
 	foreach (keys %hash) {
@@ -461,7 +461,7 @@ END
 	my $indent = 0;
 	$uri = $uri.'/' if $uri !~ /.*\/$/;
 
-	if ($bredir ne "on") {
+	if ($bredir ne 'on') {
 	    $hash{'top.level'} = $uri;
 	    $toplevel = $uri;
 
@@ -470,7 +470,7 @@ END
 	}
 
 # -------------------------------- if not at top level, provide an uplink arrow
-	if ($toplevel ne "/res/"){
+	if ($toplevel ne '/res/'){
 	    my (@uri_com) = split(/\//,$uri);
 	    pop @uri_com;
 	    my $upone = join('/',@uri_com);
@@ -487,11 +487,11 @@ END
 	$r->print("<input type='hidden' name='fnum' value='$fnum'></form>");
 
 # -------------------------------------------------------------- end the tables
-	$r->print("</table>");
-	$r->print("</td></tr></table>");
+	$r->print('</table>');
+	$r->print('</td></tr></table>');
 
 # --------------------------------------------------- end the output and return
-	$r->print("</body></html>\n");
+	$r->print('</body></html>'."\n");
 	untie(%hash);
     } else {
 	$r->print('<html><head></head><body>Unable to tie hash to db '.
@@ -511,10 +511,10 @@ sub scanDir {
     my %dupdirs = %dirs;
     my @list=&get_list($r,$startdir);
     foreach my $line (@list) {
-	my ($strip,$dom,$foo,$testdir,$foo)=split(/\&/,$line,5); 
+	my ($strip,$dom,undef,$testdir,undef)=split(/\&/,$line,5); 
 	next if $strip =~ /.*\.meta$/;
 	my (@fileparts) = split(/\./,$strip);
-	if ($hash{'display_attrs_6'} != 1) {
+	if ($hash{'display_attrs_7'} != 1) {
 	    if (scalar(@fileparts) >= 3) {
 		my $fext = pop @fileparts;
 		my $ov = pop @fileparts;
@@ -523,25 +523,26 @@ sub scanDir {
 	    }
 	}
 
-	if ($dom eq "domain") {
-	    $compuri = join('',$strip,"/");  # dom list has /res/<domain name>
+	if ($dom eq 'domain') {
+	    $compuri = join('',$strip,'/');  # dom list has /res/<domain name>
 	    $curdir = $compuri;
 	} else {
 	    # user, dir & file have name only, i.e., w/o path
-	    $compuri = join('',$startdir,$strip,"/");
+	    $compuri = join('',$startdir,$strip,'/');
 	    $curdir = $startdir;
 	}
-	my $diropen = "closed";
+	my $diropen = 'closed';
 	if (($dirptr&$testdir) or ($dom =~ /^(domain|user)$/)) {
 	    while (my ($key,$val)= each %dupdirs) {
 		if ($key eq $compuri and $val eq "open") {
 		    $diropen = "opened";
-		    delete $dupdirs{key},$dirs{$key};
+		    delete($dupdirs{$key});
+		    delete($dirs{$key});
 		}
 	    }
 	}
 	&display_line($r,$diropen,$line,$indent,$curdir,$hashref,@list);
-	&scanDir ($r,$compuri,$indent) if $diropen eq "opened";
+	&scanDir ($r,$compuri,$indent) if $diropen eq 'opened';
     }
     $indent--;
 }
@@ -550,10 +551,9 @@ sub scanDir {
 sub get_list {
     my ($r,$uri)=@_;
     my @list;
-    my $luri = $uri;
-    $luri =~ s/\//_/g;
+    (my $luri = $uri) =~ s/\//_/g;
 
-    if ($ENV{'form.attrs'} eq "Refresh") {
+    if ($ENV{'form.attrs'} eq 'Refresh') {
 	foreach (keys %hash) {
 	    delete $hash{$_} if ($_ =~ /^dirlist_files_/);
 	    }
@@ -603,8 +603,8 @@ sub match_ext {
 	chomp $line;
 	$line =~ s/^\/home\/httpd\/html//;
 	my @unpackline = split (/\&/,$line);
-	next if ($unpackline[0] eq ".");
-	next if ($unpackline[0] eq "..");
+	next if ($unpackline[0] eq '.');
+	next if ($unpackline[0] eq '..');
 	my @filecom = split (/\./,$unpackline[0]);
 	my $fext = pop(@filecom);
 	my $fnptr = $unpackline[3]&$dirptr;
@@ -623,31 +623,31 @@ sub match_ext {
 # ------------------------------- displays one line in appropriate table format
 sub display_line {
     my ($r,$diropen,$line,$indent,$startdir,$hashref,@list)=@_;
-    my (@pathfn, $fndir, $fnptr);
+    my (@pathfn, $fndir);
     my $dirptr=16384;
     my $fileclr="#ffffe6";
-    my $iconpath= $r->dir_config('lonIconsURL') . "/";
+    my $iconpath= $r->dir_config('lonIconsURL') . '/';
 
     my @filecom = split (/\&/,$line);
     my @pathcom = split (/\//,$filecom[0]);
     my $listname = $pathcom[scalar(@pathcom)-1];
     my $fnptr = $filecom[3]&$dirptr;
     my $msg = 'View '.$filecom[0].' resources';
-    $msg = 'Close '.$filecom[0].' directory' if $diropen eq "opened";
+    $msg = 'Close '.$filecom[0].' directory' if $diropen eq 'opened';
 
-    my $tabtag="</td>";
+    my $tabtag='</td>';
     my $i=0;
 
-    while ($i<=5) {
-	$tabtag=join('',$tabtag,"<td bgcolor=",$fileclr,">&nbsp;</td>")
+    while ($i<=6) {
+	$tabtag=join('',$tabtag,"<td>&nbsp;</td>")
 	    if $hash{'display_attrs_'.$i} == 1;
 	$i++;
     }
 
 # display uplink arrow
-    if ($filecom[1] eq "viewOneUp") {
-	$r->print("<tr>$extrafield");
-	$r->print("<td bgcolor=$fileclr valign=bottom>\n");
+    if ($filecom[1] eq 'viewOneUp') {
+	$r->print("<tr bgcolor=$fileclr>$extrafield");
+	$r->print("<td valign=bottom>\n");
 	$r->print ('<form method="post" name="dirpathUP" action="'.$startdir.
 		   '/" '.
 		   'onSubmit="return rep_dirpath(\'UP\','.
@@ -665,11 +665,11 @@ sub display_line {
     }
 
 # display domain
-    if ($filecom[1] eq "domain") {
+    if ($filecom[1] eq 'domain') {
 	$r->print ('<input type="hidden" name="dirPointer" value="on">'."\n")
 	    if ($ENV{'form.dirPointer'} eq "on");
-	$r->print("<tr>$extrafield");
-	$r->print("<td bgcolor=$fileclr valign=bottom>");
+	$r->print("<tr bgcolor=$fileclr>$extrafield");
+	$r->print("<td valign=bottom>");
 	&begin_form ($r,$filecom[0].'/');
 	my $anchor = $filecom[0].'/';
 	$anchor =~ s/\///g;
@@ -682,14 +682,19 @@ sub display_line {
 	$r->print ('<a href="javascript:gothere(\''.$filecom[0].
 		   '/\')"><img src="'.$iconpath.'server.gif"');
 	$r->print (' border="0" /></a>'."\n");
-	$r->print("Domain - $listname $tabtag</tr></form>\n");
+	$r->print ("Domain - $listname ");
+	if ($Apache::lonnet::domaindescription{$listname}) {
+	    $r->print("(".$Apache::lonnet::domaindescription{$listname}.
+		      ")");
+	}
+	$r->print (" $tabtag</tr></form>\n");
 	return OK;
 
 # display user directory
     }
-    if ($filecom[1] eq "user") {
-	$r->print("<tr>$extrafield");
-	$r->print("<td bgcolor=$fileclr valign=bottom nowrap>\n");
+    if ($filecom[1] eq 'user') {
+	$r->print("<tr bgcolor=$fileclr>$extrafield");
+	$r->print("<td valign=bottom nowrap>\n");
 	my $curdir = $startdir.$filecom[0].'/';
 	my $anchor = $curdir;
 	$anchor =~ s/\///g;
@@ -704,12 +709,18 @@ sub display_line {
 	$r->print ('<a href="javascript:gothere(\''.$curdir.'\')"><img src='.
 		   $iconpath.'quill.gif border="0" name="'.$msg.
 		   '" height="22" /></a>');
-	$r->print ($listname.$tabtag.'</tr></form>'."\n");
+	my $domain=(split(m|/|,$startdir))[2];
+	my $plainname=&Apache::loncommon::plainname($listname,$domain);
+	$r->print ($listname);
+	if (defined($plainname) && $plainname) { $r->print(" ($plainname) "); }
+	$r->print ($tabtag.'</tr></form>'."\n");
 	return OK;
     }
 
 # display file
-    if ($fnptr == 0 and $filecom[3] ne "") {
+    if ($fnptr == 0 and $filecom[3] ne '') {
+	my $filelink = $startdir.$filecom[0];
+	return OK if (!&Apache::lonnet::allowed('bre',$filelink));
 	my @file_ext = split (/\./,$listname);
 	my $curfext = $file_ext[-1];
         if (@Omit) {
@@ -727,8 +738,7 @@ sub display_line {
 	$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>");
+	$r->print("<tr bgcolor=$fileclr><td nowrap valign='bottom'>");
 	my $metafile = grep /^$filecom[0]\.meta\&/, @list;
 	my $title;
         if ($ENV{'form.catalogmode'} eq 'interactive') {
@@ -736,19 +746,20 @@ sub display_line {
 	    $title = &Apache::lonnet::metadata($filelink,'title')
 		if ($metafile == 1);
 	    $title=$listname unless $title;
-	    my $titleesc=$title;
-	    $titleesc=~s/\'/\\'/; #' (clean up this spare quote
+	    my $titleesc=HTML::Entities::encode($title);
+	    $titleesc=~s/\'/\\'/; #' (clean up this spare quote)
             $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>");
+	    $r->print("</td><td valign='bottom' nowrap>");
 	}
         elsif ($ENV{'form.catalogmode'} eq 'groupimport') {
 	    $title=$listname;
 	    $title = &Apache::lonnet::metadata($filelink,'title')
 		if ($metafile == 1);
 	    $title=$listname unless $title;
+	    my $titleesc=&HTML::Entities::encode($title);
 	    $r->print("<form name='form$fnum'>\n");
 	    $r->print("<input type='checkbox' name='filelink"."' ".
 		      "value='$filelink' onClick='".
@@ -758,11 +769,11 @@ sub display_line {
 	    }
 	    $r->print(">\n");
 	    $r->print("<input type='hidden' name='title"."' ".
-		      "value='$title'>\n");
+		      "value='$titleesc'>\n");
 	    $r->print("</form>\n");
-	    $r->print("</td><td valign='bottom' nowrap bgcolor=$fileclr>");
+	    $r->print("</td><td valign='bottom' nowrap>");
 	    $hash{"pre_${fnum}_link"}=$filelink;
-	    $hash{"pre_${fnum}_title"}=$title;
+	    $hash{"pre_${fnum}_title"}=$titleesc;
   	    $fnum++;
 	}
 
@@ -792,38 +803,58 @@ sub display_line {
 		   "TARGET=_self>metadata</a>) ") if ($metafile == 1);
 
 	$r->print("</td>\n");
-	$r->print("<td bgcolor=$fileclr align=right valign=bottom> ",
+	if ($hash{'display_attrs_0'} == 1) {
+	    my $title = &Apache::lonnet::metadata($filelink,'title')
+		if ($metafile == 1);
+	    $r->print('<td valign=bottom> '.($title eq '' ? '&nbsp;' : $title).
+		      ' </td>'."\n");
+	}
+	$r->print('<td align=right valign=bottom> ',
 		  $filecom[8]," </td>\n") 
-	    if $hash{'display_attrs_0'} == 1;
-	$r->print("<td bgcolor=$fileclr valign=bottom> ".
-		  (localtime($filecom[9]))." </td>\n") 
 	    if $hash{'display_attrs_1'} == 1;
-	$r->print("<td bgcolor=$fileclr valign=bottom> ".
-		  (localtime($filecom[10]))." </td>\n") 
+	$r->print('<td valign=bottom> '.
+		  (localtime($filecom[9]))." </td>\n") 
 	    if $hash{'display_attrs_2'} == 1;
+	$r->print('<td valign=bottom> '.
+		  (localtime($filecom[10]))." </td>\n") 
+	    if $hash{'display_attrs_3'} == 1;
 
-	if ($hash{'display_attrs_3'} == 1) {
+	if ($hash{'display_attrs_4'} == 1) {
 	    my $author = &Apache::lonnet::metadata($filelink,'author')
 		if ($metafile == 1);
-	    $author = '&nbsp;' if (!$author);
-	    $r->print("<td bgcolor=$fileclr valign=bottom> ".$author.
+	    $r->print('<td valign=bottom> '.($author eq '' ? '&nbsp;' : $author).
 		      " </td>\n");
 	}
-	if ($hash{'display_attrs_4'} == 1) {
+	if ($hash{'display_attrs_5'} == 1) {
 	    my $keywords = &Apache::lonnet::metadata($filelink,'keywords')
 		if ($metafile == 1);
-	    $keywords = '&nbsp;' if (!$keywords);
-	    $r->print("<td bgcolor=$fileclr valign=bottom> ".$keywords.
+	    # $keywords = '&nbsp;' if (!$keywords);
+	    $r->print('<td valign=bottom> '.($keywords eq '' ? '&nbsp;' : $keywords).
 		      " </td>\n");
 	}
-	if ($hash{'display_attrs_5'} == 1) {
+	if ($hash{'display_attrs_6'} == 1) {
 	    my $lang = &Apache::lonnet::metadata($filelink,'language')
 		if ($metafile == 1);
 	    $lang = &Apache::loncommon::languagedescription($lang);
-	    $lang = '&nbsp;' if (!$lang);
-	    $r->print("<td bgcolor=$fileclr valign=bottom> ".$lang.
+	    $r->print('<td valign=bottom> '.($lang eq '' ? '&nbsp;' : $lang).
 		      " </td>\n");
 	}
+        if ($hash{'display_attrs_8'} == 1) {
+            my $output='';
+            my $embstyle=&Apache::loncommon::fileembstyle($curfext);
+	    if ($embstyle eq 'ssi') {
+	       $output=&Apache::lonnet::ssi_body($filelink);
+               $output='<font size="-2">'.$output.'</font>';
+	   } elsif ($embstyle eq 'img') {
+               $output='<img src="'.$filelink.'" />';
+           } elsif ($filelink=~/^\/res\/(\w+)\/(\w+)\//) {
+               $output='<img src="http://'.
+		 $Apache::lonnet::hostname{&Apache::lonnet::homeserver($2,$1)}.
+                 '/cgi-bin/thumbnail.gif?url='.$filelink.'" />';
+           }
+	   $r->print('<td valign=bottom> '.($output eq '' ? '&nbsp;':$output).
+		      " </td>\n");
+        }
 	$r->print("</tr>\n");
     }
 
@@ -834,7 +865,7 @@ sub display_line {
 	my $curdir = $startdir.$filecom[0].'/';
 	my $anchor = $curdir;
 	$anchor =~ s/\///g;
-	$r->print("<tr>$extrafield<td bgcolor=$fileclr valign=bottom>");
+	$r->print("<tr bgcolor=$fileclr>$extrafield<td valign=bottom>");
 	&begin_form ($r,$curdir);
 	my $indentm1 = $indent-1;
 	if ($indentm1 < 11 and $indentm1 > 0) {
@@ -883,19 +914,14 @@ sub begin_form {
 
 # --------- settings whenever the user causes the indexer window to be launched
 sub start_fresh_session {
-    delete $hash{'mode_catalog'};
-    delete $hash{'form_mode'};
-    delete $hash{'form_form'};
-    delete $hash{'form_element'};
-    delete $hash{'form_omit'};
-    delete $hash{'form_only'};
+    delete $hash{'form.catalogmode'};
+    delete $hash{'form.mode'};
+    delete $hash{'form.form'};
+    delete $hash{'form.element'};
+    delete $hash{'form.omit'};
+    delete $hash{'form.only'};
     foreach (keys %hash) {
-	if ($_ =~ /^pre_/) {
-	    delete $hash{$_};
-	}
-	if ($_ =~ /^store/) {
-	    delete $hash{$_};
-	}
+        delete $hash{$_} if (/^(pre_|store)/);
     }
 }
 
@@ -914,6 +940,15 @@ sub setvalues {
 
 1;
 
+sub cleanup {
+    if (tied(%hash)){
+	&Apache::lonnet::logthis('Cleanup indexer: hash');
+        unless (untie(%hash)) {
+	    &Apache::lonnet::logthis('Failed cleanup indexer: hash');
+        }
+    }
+}
+
 =head1 NAME
 
 Apache::lonindexer - mod_perl module for cross server filesystem browsing