--- loncom/interface/lonindexer.pm	2006/02/07 19:46:30	1.138
+++ loncom/interface/lonindexer.pm	2006/03/06 18:23:10	1.140
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.138 2006/02/07 19:46:30 albertel Exp $
+# $Id: lonindexer.pm,v 1.140 2006/03/06 18:23:10 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1057,39 +1057,13 @@ sub display_line {
 	   &dynmetaprint($r,$filelink,'comefrom_list');
 	   &dynmetaprint($r,$filelink,'sequsage_list');
 	   &dynmetaprint($r,$filelink,'dependencies');
+           &dynmetaprint($r,$filelink,'course_list');
 	   $r->print('</td>');
         }
         if ($hash{'display_attrs_7'} == 1) {
 # Show resource
-            my $output='';
-            my $embstyle=&Apache::loncommon::fileembstyle($curfext);
-	    if ($embstyle eq 'ssi') {
-		my $cache=$Apache::lonnet::perlvar{'lonDocRoot'}.$filelink.
-		    '.tmp';
-		if ((!$env{'form.updatedisplay'}) &&
-		    (-e $cache)) {
-		    open(FH,$cache);
-		    $output=join("\n",<FH>);
-		    close(FH);
-		} else {
-		    $output=&Apache::lonnet::ssi_body($filelink);
-		    if ($output=~/LONCAPAACCESSCONTROLERRORSCREEN/) {
-			$output='';
-		    } else {
-			open(FH,">$cache");
-			print FH $output;
-			close(FH);
-		    }
-		}
-		$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> '.($output eq '' ? '&nbsp;':$output).
+	   my $output=&showpreview($filelink);
+           $r->print('<td> '.($output eq '' ? '&nbsp;':$output).
 		      " </td>\n");
         }
 	$r->print("</tr>\n");
@@ -1181,6 +1155,40 @@ sub display_line {
 
 }
 
+sub showpreview {
+    my ($filelink)=@_;
+    my ($curfext)=($filelink=~/\.(\w+)$/);
+    my $output='';
+    my $embstyle=&Apache::loncommon::fileembstyle($curfext);
+    if ($embstyle eq 'ssi') {
+       my $cache=$Apache::lonnet::perlvar{'lonDocRoot'}.$filelink.
+                    '.tmp';
+       if ((!$env{'form.updatedisplay'}) &&
+                    (-e $cache)) {
+          open(FH,$cache);
+          $output=join("\n",<FH>);
+          close(FH);
+       } else {
+          $output=&Apache::lonnet::ssi_body($filelink);
+          if ($output=~/LONCAPAACCESSCONTROLERRORSCREEN/s) {
+             $output='';
+          } else {
+             open(FH,">$cache");
+             print FH $output;
+             close(FH);
+          }
+       }
+       $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.'" />';
+    }
+    return $output;
+}
+
 sub dynmetaprint {
     my ($r,$filelink,$item)=@_;
     if ($dynhash{$filelink}->{$item}) {