--- loncom/interface/lonindexer.pm 2006/12/05 02:55:53 1.154 +++ loncom/interface/lonindexer.pm 2007/03/08 01:58:45 1.158 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Directory Indexer # -# $Id: lonindexer.pm,v 1.154 2006/12/05 02:55:53 albertel Exp $ +# $Id: lonindexer.pm,v 1.158 2007/03/08 01:58:45 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -680,7 +680,7 @@ sub get_list { $uri=~s/\/+/\//g; foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$uri))) { my @ratpart=split(/\:/,$_); - push @list,$ratpart[1]; + push(@list,&LONCAPA::map::qtescape($ratpart[1])); } $hash{'dirlist_files_'.$luri} = join("\n",@list); } else { @@ -689,7 +689,7 @@ sub get_list { $hash{'dirlist_files_'.$luri} = join("\n",@list); $hash{'dirlist_timestamp_files_'.$luri} = time; } - return @list=&match_ext($r,@list); + return @list=&match_ext($r,@list); } sub dynmetaread { @@ -799,7 +799,8 @@ sub display_line { my $i=0; while ($i<=11) { $tabtag=join('',$tabtag," ") - if $hash{'display_attrs_'.$i} == 1; + if ($i != 9 && + $hash{'display_attrs_'.$i} == 1); $i++; } my $valign = ($hash{'display_attrs_7'} == 1 ? 'top' : 'bottom'); @@ -855,8 +856,8 @@ sub display_line { '\')">print (' border="0" />'."\n"); $r->print (&mt("Domain")." - $listname "); - if ($Apache::lonnet::domaindescription{$listname}) { - $r->print("(".$Apache::lonnet::domaindescription{$listname}. + if (&Apache::lonnet::domain($listname,'description')) { + $r->print("(".&Apache::lonnet::domain($listname,'description'). ")"); } $r->print ("$tabtag\n"); @@ -1202,7 +1203,7 @@ sub showpreview { $output=''.&mt('Preview').''; } elsif ($filelink=~m{^/res/($match_domain)/($match_username)/}) { $output=''.&mt('Preview').''; } return $output;