--- loncom/interface/lonindexer.pm 2003/02/03 18:03:52 1.59
+++ 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.59 2003/02/03 18:03:52 harris41 Exp $
+# $Id: lonindexer.pm,v 1.62 2003/03/14 16:12:14 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -519,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+/);
}
}
@@ -682,8 +682,12 @@ sub display_line {
$r->print ('print (' border="0" />'."\n");
- $r->print("Domain - $listname (".
- $Apache::lonnet::domaindescription{$listname}.") $tabtag\n");
+ $r->print ("Domain - $listname ");
+ if ($Apache::lonnet::domaindescription{$listname}) {
+ $r->print("(".$Apache::lonnet::domaindescription{$listname}.
+ ")");
+ }
+ $r->print (" $tabtag\n");
return OK;
# display user directory
@@ -705,7 +709,11 @@ sub display_line {
$r->print ('
');
- $r->print ($listname.$tabtag.''."\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.''."\n");
return OK;
}
@@ -731,7 +739,7 @@ sub display_line {
(!defined($embstyle) || $embstyle eq 'unk' || $embstyle eq 'hdn');
#
$r->print("