--- loncom/interface/lonindexer.pm	2003/01/09 22:04:28	1.54
+++ 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.54 2003/01/09 22:04:28 www 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,10 @@
 # 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
 #
 ###
@@ -373,7 +368,7 @@ $r->print(&Apache::loncommon::bodytag('B
 	
 # ---------------------------------- get state of file attributes to be showing
 	if ($ENV{'form.attrs'} ne '') {
-	    for (my $i=0; $i<=7; $i++) {
+	    for (my $i=0; $i<=8; $i++) {
 		delete $hash{'display_attrs_'.$i};
 		if ($ENV{'form.attr'.$i} == 1) {
 		    $attrchk[$i] = 'checked';
@@ -381,7 +376,7 @@ $r->print(&Apache::loncommon::bodytag('B
 		}
 	    }
 	} else {
-	    for (my $i=0; $i<=7; $i++) {
+	    for (my $i=0; $i<=8; $i++) {
 		$attrchk[$i] = 'checked' if $hash{'display_attrs_'.$i} == 1;
 	    }
 	}
@@ -395,7 +390,7 @@ $r->print(&Apache::loncommon::bodytag('B
 <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>
-</tr><tr>
+<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>
@@ -432,6 +427,8 @@ END
 	    if ($hash{'display_attrs_5'} == 1);
 	$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"
@@ -685,8 +682,12 @@ 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 (".
-      $Apache::lonnet::domaindescription{$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
@@ -708,7 +709,11 @@ 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;
     }
 
@@ -834,6 +839,22 @@ sub display_line {
 	    $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");
     }
 
@@ -920,7 +941,12 @@ sub setvalues {
 1;
 
 sub cleanup {
-    untie(%hash) if (tied(%hash));
+    if (tied(%hash)){
+	&Apache::lonnet::logthis('Cleanup indexer: hash');
+        unless (untie(%hash)) {
+	    &Apache::lonnet::logthis('Failed cleanup indexer: hash');
+        }
+    }
 }
 
 =head1 NAME