--- loncom/interface/lonindexer.pm	2003/02/03 18:03:52	1.59
+++ loncom/interface/lonindexer.pm	2003/06/14 00:15:01	1.66
@@ -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.66 2003/06/14 00:15:01 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -124,7 +124,7 @@ sub handler {
 
     $extrafield='';
     my $diropendb = 
-	"/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db";
+	"/home/httpd/perl/tmp/$ENV{'user.domain'}_$ENV{'user.name'}_indexer.db";
 
     if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) {
 	if ($ENV{'form.launch'} eq '1') {
@@ -390,11 +390,12 @@ $r->print(&Apache::loncommon::bodytag('B
 <td><input type="checkbox" name="attr1" value="1" $attrchk[1] /> Size</td>
 <td><input type="checkbox" name="attr2" value="1" $attrchk[2] /> Last access</td>
 <td><input type="checkbox" name="attr3" value="1" $attrchk[3] /> Last modified</td>
-<td rowspan="2"><input type="checkbox" name="attr8" value="1" $attrchk[8] /> Show Resource</td></tr><tr>
+<td><input type="checkbox" name="attr8" value="1" $attrchk[8] /> All versions</td></tr><tr>
 <td><input type="checkbox" name="attr4" value="1" $attrchk[4] /> Author</td>
 <td><input type="checkbox" name="attr5" value="1" $attrchk[5] /> Keywords</td>
 <td><input type="checkbox" name="attr6" value="1" $attrchk[6] /> Language</td>
-<td><input type="checkbox" name="attr7" value="1" $attrchk[7] /> All versions</td>
+<td><input type="checkbox" name="attr7" value="1" $attrchk[7] /> Show Resource</td>
+<td>&nbsp;</td>
 </tr></table>
 <input type="hidden" name="dirPointer" value="on" />
 <input type="hidden" name="acts" value="" />
@@ -428,7 +429,7 @@ END
 	$r->print("<td><b>Language</b></td>\n")
 	    if ($hash{'display_attrs_6'} == 1);
 	$r->print("<td><b>Resource</b></td>\n")
-	    if ($hash{'display_attrs_8'} == 1);
+	    if ($hash{'display_attrs_7'} == 1);
 	$r->print('</tr>');
 
 # ----------------- read in what directories have previously been set to "open"
@@ -514,12 +515,12 @@ sub scanDir {
 	my ($strip,$dom,undef,$testdir,undef)=split(/\&/,$line,5); 
 	next if $strip =~ /.*\.meta$/;
 	my (@fileparts) = split(/\./,$strip);
-	if ($hash{'display_attrs_7'} != 1) {
+	if ($hash{'display_attrs_8'} != 1) {
 	    if (scalar(@fileparts) >= 3) {
 		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+/);
 	    }
 	}
 
@@ -638,16 +639,18 @@ sub display_line {
     my $tabtag='</td>';
     my $i=0;
 
-    while ($i<=6) {
+    while ($i<=7) {
 	$tabtag=join('',$tabtag,"<td>&nbsp;</td>")
 	    if $hash{'display_attrs_'.$i} == 1;
 	$i++;
     }
+	
+    my $valign = ($hash{'display_attrs_7'} == 1 ? 'top' : 'bottom');
 
 # display uplink arrow
     if ($filecom[1] eq 'viewOneUp') {
 	$r->print("<tr bgcolor=$fileclr>$extrafield");
-	$r->print("<td valign=bottom>\n");
+	$r->print("<td valign=$valign>\n");
 	$r->print ('<form method="post" name="dirpathUP" action="'.$startdir.
 		   '/" '.
 		   'onSubmit="return rep_dirpath(\'UP\','.
@@ -663,13 +666,16 @@ sub display_line {
 	$r->print("Up $tabtag</tr></form>\n");
 	return OK;
     }
+# Do we have permission to look at this?
+
+    return OK if (!&Apache::lonnet::allowed('bre',$startdir.$filecom[0]));
 
 # display domain
     if ($filecom[1] eq 'domain') {
 	$r->print ('<input type="hidden" name="dirPointer" value="on">'."\n")
 	    if ($ENV{'form.dirPointer'} eq "on");
 	$r->print("<tr bgcolor=$fileclr>$extrafield");
-	$r->print("<td valign=bottom>");
+	$r->print("<td valign=$valign>");
 	&begin_form ($r,$filecom[0].'/');
 	my $anchor = $filecom[0].'/';
 	$anchor =~ s/\///g;
@@ -682,15 +688,19 @@ sub display_line {
 	$r->print ('<a href="javascript:gothere(\''.$filecom[0].
 		   '/\')"><img src="'.$iconpath.'server.gif"');
 	$r->print (' border="0" /></a>'."\n");
-	$r->print("Domain - $listname (".
-      $Apache::lonnet::domaindescription{$listname}.") $tabtag</tr></form>\n");
+	$r->print ("Domain - $listname ");
+	if ($Apache::lonnet::domaindescription{$listname}) {
+	    $r->print("(".$Apache::lonnet::domaindescription{$listname}.
+		      ")");
+	}
+	$r->print (" $tabtag</tr></form>\n");
 	return OK;
 
 # display user directory
     }
     if ($filecom[1] eq 'user') {
 	$r->print("<tr bgcolor=$fileclr>$extrafield");
-	$r->print("<td valign=bottom nowrap>\n");
+	$r->print("<td valign=$valign nowrap>\n");
 	my $curdir = $startdir.$filecom[0].'/';
 	my $anchor = $curdir;
 	$anchor =~ s/\///g;
@@ -705,14 +715,17 @@ sub display_line {
 	$r->print ('<a href="javascript:gothere(\''.$curdir.'\')"><img src='.
 		   $iconpath.'quill.gif border="0" name="'.$msg.
 		   '" height="22" /></a>');
-	$r->print ($listname.$tabtag.'</tr></form>'."\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.'</tr></form>'."\n");
 	return OK;
     }
 
 # display file
     if ($fnptr == 0 and $filecom[3] ne '') {
 	my $filelink = $startdir.$filecom[0];
-	return OK if (!&Apache::lonnet::allowed('bre',$filelink));
 	my @file_ext = split (/\./,$listname);
 	my $curfext = $file_ext[-1];
         if (@Omit) {
@@ -730,8 +743,8 @@ sub display_line {
 	$iconname = $curfext.".gif" unless
 	    (!defined($embstyle) || $embstyle eq 'unk' || $embstyle eq 'hdn');
 	#
-	$r->print("<tr bgcolor=$fileclr><td nowrap valign='bottom'>");
-	my $metafile = grep /^$filecom[0]\.meta\&/, @list;
+	$r->print("<tr bgcolor=$fileclr><td nowrap valign='$valign'>");
+	my $metafile = grep /^\Q$filecom[0]\E\.meta\&/, @list;
 	my $title;
         if ($ENV{'form.catalogmode'} eq 'interactive') {
 	    $title=$listname;
@@ -744,7 +757,7 @@ sub display_line {
                       $titleesc,"','",$filelink,"')\">");
 	    $r->print("<img src='",$iconpath,"select.gif' border='0' /></a>".
 		      "\n");
-	    $r->print("</td><td valign='bottom' nowrap>");
+	    $r->print("</td><td valign='$valign' nowrap>");
 	}
         elsif ($ENV{'form.catalogmode'} eq 'groupimport') {
 	    $title=$listname;
@@ -763,7 +776,7 @@ sub display_line {
 	    $r->print("<input type='hidden' name='title"."' ".
 		      "value='$titleesc'>\n");
 	    $r->print("</form>\n");
-	    $r->print("</td><td valign='bottom' nowrap>");
+	    $r->print("</td><td valign='$valign' nowrap>");
 	    $hash{"pre_${fnum}_link"}=$filelink;
 	    $hash{"pre_${fnum}_title"}=$titleesc;
   	    $fnum++;
@@ -798,46 +811,44 @@ sub display_line {
 	if ($hash{'display_attrs_0'} == 1) {
 	    my $title = &Apache::lonnet::metadata($filelink,'title')
 		if ($metafile == 1);
-	    $r->print('<td valign=bottom> '.($title eq '' ? '&nbsp;' : $title).
+	    $r->print('<td valign=$valign> '.($title eq '' ? '&nbsp;' : $title).
 		      ' </td>'."\n");
 	}
-	$r->print('<td align=right valign=bottom> ',
+	$r->print('<td align=right valign=$valign> ',
 		  $filecom[8]," </td>\n") 
 	    if $hash{'display_attrs_1'} == 1;
-	$r->print('<td valign=bottom> '.
+	$r->print('<td valign=$valign> '.
 		  (localtime($filecom[9]))." </td>\n") 
 	    if $hash{'display_attrs_2'} == 1;
-	$r->print('<td valign=bottom> '.
+	$r->print('<td valign=$valign> '.
 		  (localtime($filecom[10]))." </td>\n") 
 	    if $hash{'display_attrs_3'} == 1;
 
 	if ($hash{'display_attrs_4'} == 1) {
 	    my $author = &Apache::lonnet::metadata($filelink,'author')
 		if ($metafile == 1);
-	    $r->print('<td valign=bottom> '.($author eq '' ? '&nbsp;' : $author).
+	    $r->print('<td valign=$valign> '.($author eq '' ? '&nbsp;' : $author).
 		      " </td>\n");
 	}
 	if ($hash{'display_attrs_5'} == 1) {
 	    my $keywords = &Apache::lonnet::metadata($filelink,'keywords')
 		if ($metafile == 1);
 	    # $keywords = '&nbsp;' if (!$keywords);
-	    $r->print('<td valign=bottom> '.($keywords eq '' ? '&nbsp;' : $keywords).
+	    $r->print('<td valign=$valign> '.($keywords eq '' ? '&nbsp;' : $keywords).
 		      " </td>\n");
 	}
 	if ($hash{'display_attrs_6'} == 1) {
 	    my $lang = &Apache::lonnet::metadata($filelink,'language')
 		if ($metafile == 1);
 	    $lang = &Apache::loncommon::languagedescription($lang);
-	    $r->print('<td valign=bottom> '.($lang eq '' ? '&nbsp;' : $lang).
+	    $r->print('<td valign=$valign> '.($lang eq '' ? '&nbsp;' : $lang).
 		      " </td>\n");
 	}
-        if ($hash{'display_attrs_8'} == 1) {
+        if ($hash{'display_attrs_7'} == 1) {
             my $output='';
             my $embstyle=&Apache::loncommon::fileembstyle($curfext);
 	    if ($embstyle eq 'ssi') {
-	       $output=&Apache::lonnet::ssi($filelink);
-               $output=~s/^.*\<body[^\>]*\>//si;
-               $output=~s/\<\/body\s*\>.*$//si;
+	       $output=&Apache::lonnet::ssi_body($filelink);
                $output='<font size="-2">'.$output.'</font>';
 	   } elsif ($embstyle eq 'img') {
                $output='<img src="'.$filelink.'" />';
@@ -846,7 +857,7 @@ sub display_line {
 		 $Apache::lonnet::hostname{&Apache::lonnet::homeserver($2,$1)}.
                  '/cgi-bin/thumbnail.gif?url='.$filelink.'" />';
            }
-	   $r->print('<td valign=bottom> '.($output eq '' ? '&nbsp;':$output).
+	   $r->print('<td valign=$valign> '.($output eq '' ? '&nbsp;':$output).
 		      " </td>\n");
         }
 	$r->print("</tr>\n");
@@ -859,7 +870,7 @@ sub display_line {
 	my $curdir = $startdir.$filecom[0].'/';
 	my $anchor = $curdir;
 	$anchor =~ s/\///g;
-	$r->print("<tr bgcolor=$fileclr>$extrafield<td valign=bottom>");
+	$r->print("<tr bgcolor=$fileclr>$extrafield<td valign=$valign>");
 	&begin_form ($r,$curdir);
 	my $indentm1 = $indent-1;
 	if ($indentm1 < 11 and $indentm1 > 0) {