--- loncom/interface/lonindexer.pm	2006/09/21 22:11:12	1.152
+++ loncom/interface/lonindexer.pm	2006/12/11 02:12:08	1.155
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.152 2006/09/21 22:11:12 albertel Exp $
+# $Id: lonindexer.pm,v 1.155 2006/12/11 02:12:08 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) {
 </script>
 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)
@@ -798,7 +799,8 @@ sub display_line {
     my $i=0;
     while ($i<=11) {
 	$tabtag=join('',$tabtag,"<td>&nbsp;</td>")
-	    if $hash{'display_attrs_'.$i} == 1;
+	    if ($i != 9 &&
+		$hash{'display_attrs_'.$i} == 1);
 	$i++;
     }
     my $valign = ($hash{'display_attrs_7'} == 1 ? 'top' : 'bottom');
@@ -913,7 +915,7 @@ sub display_line {
                       $quotable_filelink,"')\">");
 	    $r->print("<img alt=\"\" src='",$iconpath,"select.gif' border='0' /></a>".
 		      "\n");
-	    $r->print("</td><td nowrap>");
+	    $r->print("</td><td nowrap='nowrap' valign='top'>");
 	} elsif ($env{'form.catalogmode'} eq 'import') {
 	    $r->print("<form name='form$fnum' action=''>\n");
 	    $r->print("<input type='checkbox' name='filelink"."' ".
@@ -923,7 +925,7 @@ sub display_line {
 		$r->print("checked");
 	    }
 	    $r->print(" />\n");
-	    $r->print("</form></td><td nowrap>");
+	    $r->print("</form></td><td nowrap='nowrap' valign='top'>");
 	    $hash{"pre_${fnum}_link"}=$filelink;
   	    $fnum++;
 	}
@@ -1199,7 +1201,7 @@ sub showpreview {
        $output='<font size="-2">'.$output.'</font>';
     } elsif ($embstyle eq 'img') {
        $output='<img alt="'.&mt('Preview').'" src="'.$filelink.'" />';
-    } elsif ($filelink=~/^\/res\/(\w+)\/(\w+)\//) {
+    } elsif ($filelink=~m{^/res/($match_domain)/($match_username)/}) {
        $output='<img  alt="'.&mt('Preview').'" src="http://'.
                  $Apache::lonnet::hostname{&Apache::lonnet::homeserver($2,$1)}.
                  '/cgi-bin/thumbnail.gif?url='.$filelink.'" />';