--- loncom/interface/lonindexer.pm 2006/09/29 18:21:43 1.153
+++ loncom/interface/lonindexer.pm 2006/12/05 02:55:53 1.154
@@ -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.154 2006/12/05 02:55:53 albertel 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
@@ -366,7 +367,7 @@ function gothere(val) {
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)
@@ -1199,7 +1200,7 @@ sub showpreview {
$output=''.$output.'';
} elsif ($embstyle eq 'img') {
$output='';
- } elsif ($filelink=~/^\/res\/(\w+)\/(\w+)\//) {
+ } elsif ($filelink=~m{^/res/($match_domain)/($match_username)/}) {
$output='';