--- loncom/interface/lonindexer.pm	2001/05/21 15:22:48	1.4
+++ loncom/interface/lonindexer.pm	2001/05/21 18:11:31	1.5
@@ -90,21 +90,21 @@ ENDHEADER
 </form>
 END
 
-    my $diropen = "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_diropen.db";
+    my $titleclr="#ddffff";
+    $r->print("<table border=0><tr><td bgcolor=#eeeeee>\n");
+    $r->print("<table border=0><tr>\n");
+    $r->print("<td bgcolor=$titleclr><b>Name</b></td>\n");
+    $r->print("<td bgcolor=$titleclr align=right><b>Size (bytes) </b></td>\n") if ($ENV{'form.attr0'} == 1);
+    $r->print("<td bgcolor=$titleclr><b>Last accessed</b></td>\n") if ($ENV{'form.attr1'} == 1);
+    $r->print("<td bgcolor=$titleclr><b>Last modified</b></td>\n") if ($ENV{'form.attr2'} == 1);
+    $r->print("<td bgcolor=$titleclr><b>Author(s)</b></td>\n") if ($ENV{'form.attr3'} == 1);
+    $r->print("<td bgcolor=$titleclr><b>Keywords</b></td>\n") if ($ENV{'form.attr4'} == 1);
+    $r->print("<td bgcolor=$titleclr><b>Language</b></td>\n") if ($ENV{'form.attr5'} == 1);
+    $r->print("</tr>");
 
-    if (tie(%hash,'GDBM_File',$diropen,&GDBM_WRCREAT,0640)) {
-	my $titleclr="#ddffff";
-	$r->print("<table border=0><tr><td bgcolor=#eeeeee>\n");
-	$r->print("<table border=0><tr>\n");
-	$r->print("<td bgcolor=$titleclr><b>Name</b></td>\n");
-	$r->print("<td bgcolor=$titleclr align=right><b>Size (bytes) </b></td>\n") if ($ENV{'form.attr0'} == 1);
-	$r->print("<td bgcolor=$titleclr><b>Last accessed</b></td>\n") if ($ENV{'form.attr1'} == 1);
-	$r->print("<td bgcolor=$titleclr><b>Last modified</b></td>\n") if ($ENV{'form.attr2'} == 1);
-	$r->print("<td bgcolor=$titleclr><b>Author(s)</b></td>\n") if ($ENV{'form.attr3'} == 1);
-	$r->print("<td bgcolor=$titleclr><b>Keywords</b></td>\n") if ($ENV{'form.attr4'} == 1);
-	$r->print("<td bgcolor=$titleclr><b>Language</b></td>\n") if ($ENV{'form.attr5'} == 1);
-	$r->print("</tr>");
+    my $diropen = "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db";
 
+    if (tie(%hash,'GDBM_File',$diropen,&GDBM_WRCREAT,0640)) {
 	map {
 	    if ($_ =~ /^diropen_status_/) {
 		my $key = $_;
@@ -153,9 +153,9 @@ sub scanDir {
     my %dupdirs = %dirs;
     my @list=&get_list($r,$startdir);
     foreach my $line (@list) {
-	my ($strip,$domusr,$foo,$testdir,$foo)=split(/\&/,$line,5); 
+	my ($strip,$dom,$foo,$testdir,$foo)=split(/\&/,$line,5); 
 	next if $strip =~ /.*\.meta$/;
-	if ($domusr eq "domain") {
+	if ($dom eq "domain") {
 	    $compuri = join('',$strip,"/");  # domain list has /res/<domain name>
 	    $curdir = $compuri;
 	} else {
@@ -163,9 +163,12 @@ sub scanDir {
 	    $curdir = $startdir;
 	}
 	my $diropen = 0;
-	if (($dirptr&$testdir) or ($domusr =~ /^(domain|user)$/)) {
+	if (($dirptr&$testdir) or ($dom =~ /^(domain|user)$/)) {
 	    while (my ($key,$val)= each %dupdirs) {
-		$diropen = 1 if ($key eq $compuri and $val eq "open");
+		if ($key eq $compuri and $val eq "open") {
+		    $diropen = 1;
+		    delete $dupdirs{key},$dirs{$key};
+		}
 	    }
 	}
 	&display_line($r,$diropen,$line,$indent,$curdir,@list);