--- loncom/interface/lonindexer.pm	2003/01/20 17:20:52	1.58
+++ loncom/interface/lonindexer.pm	2003/03/14 16:12:14	1.62
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.58 2003/01/20 17:20:52 www Exp $
+# $Id: lonindexer.pm,v 1.62 2003/03/14 16:12:14 albertel 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
 #
 ###
@@ -524,7 +519,7 @@ sub scanDir {
 		my $fext = pop @fileparts;
 		my $ov = pop @fileparts;
 		my $fname = join ('.',@fileparts,$fext);
-		next if (grep /$fname/,@list and $ov =~ /\d+/);
+		next if (grep /\Q$fname\E/,@list and $ov =~ /\d+/);
 	    }
 	}
 
@@ -687,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
@@ -710,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;
     }
 
@@ -736,7 +739,7 @@ sub display_line {
 	    (!defined($embstyle) || $embstyle eq 'unk' || $embstyle eq 'hdn');
 	#
 	$r->print("<tr bgcolor=$fileclr><td nowrap valign='bottom'>");
-	my $metafile = grep /^$filecom[0]\.meta\&/, @list;
+	my $metafile = grep /^\Q$filecom[0]\E\.meta\&/, @list;
 	my $title;
         if ($ENV{'form.catalogmode'} eq 'interactive') {
 	    $title=$listname;
@@ -840,9 +843,7 @@ sub display_line {
             my $output='';
             my $embstyle=&Apache::loncommon::fileembstyle($curfext);
 	    if ($embstyle eq 'ssi') {
-	       $output=&Apache::lonnet::ssi($filelink);
-               $output=~s/^.*\<body[^\>]*\>//si;
-               $output=~s/\<\/body\s*\>.*$//si;
+	       $output=&Apache::lonnet::ssi_body($filelink);
                $output='<font size="-2">'.$output.'</font>';
 	   } elsif ($embstyle eq 'img') {
                $output='<img src="'.$filelink.'" />';