--- loncom/interface/lonindexer.pm 2006/09/29 18:21:43 1.153 +++ loncom/interface/lonindexer.pm 2007/06/27 16:35:55 1.161 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Directory Indexer # -# $Id: lonindexer.pm,v 1.153 2006/09/29 18:21:43 albertel Exp $ +# $Id: lonindexer.pm,v 1.161 2007/06/27 16:35:55 banghart Exp $ # # Copyright Michigan State University Board of Trustees # @@ -54,6 +54,7 @@ use Apache::File; use Apache::lonlocal; use Apache::lonsource(); use GDBM_File; +use LONCAPA qw(:match); # ---------------------------------------- variables used throughout the module my %hash; # global user-specific gdbm file @@ -349,6 +350,25 @@ END my $js = <<"ENDHEADER"; ENDHEADER - my ($headerdom)=($uri=~/^\/res\/(\w+)\//); + my ($headerdom)=($uri=~m{^/res/($match_domain)/}); $r->print(&Apache::loncommon::start_page('Browse Resources',$js, {'domain' => $headerdom,})); # - Evaluate actions from previous page (both cumulatively and chronologically) @@ -679,7 +699,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 { @@ -688,7 +708,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 { @@ -798,7 +818,8 @@ sub display_line { my $i=0; while ($i<=11) { $tabtag=join('',$tabtag,"