--- loncom/interface/lonindexer.pm	2001/05/21 15:22:48	1.4
+++ loncom/interface/lonindexer.pm	2001/05/29 12:24:17	1.6
@@ -7,6 +7,7 @@
 #
 # 05/9-05/19/2001 H. K. Ng
 # 05/21/2001 H. K. Ng
+# 05/23/2001 H. K. Ng
 #
 package Apache::lonindexer;
 
@@ -70,9 +71,23 @@ ENDHEADER
 
     $r->print("<h2><font color=\"\#888888\">The LearningOnline With CAPA Network Directory Browser</font></h2>\n");
 
-    for (my $i=0; $i<=5; $i++) {
-	$attrchk[$i] = "checked" if $ENV{'form.attr'.$i} == 1;
-    }
+    my $diropen = "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db";
+
+    if (tie(%hash,'GDBM_File',$diropen,&GDBM_WRCREAT,0640)) {
+
+	if ($ENV{'form.attrs'} ne "") {
+	    for (my $i=0; $i<=5; $i++) {
+		delete $hash{'display_attrs_'.$i};
+		if ($ENV{'form.attr'.$i} == 1) {
+		    $attrchk[$i] = "checked";
+		    $hash{'display_attrs_'.$i} = 1;
+		}
+	    }
+	} else {
+	    for (my $i=0; $i<=5; $i++) {
+		$attrchk[$i] = "checked" if $hash{'display_attrs_'.$i} == 1;
+	    }
+	}
     $r->print(<<END);
 <b><font color="#666666">Display file attributes</font></b><br>
 <form method="post" name="fileattr" action="$uri" enctype="application/x-www-form-urlencoded">
@@ -85,25 +100,22 @@ ENDHEADER
 <td><input type=checkbox name=attr4 value="1" $attrchk[4]> Keywords</td>
 <td><input type=checkbox name=attr5 value="1" $attrchk[5]> Language</td>
 </tr></table>
-<input type="submit" name="dirlistattr" value="Review">&nbsp;
-<input type="submit" name="dirlistattr" value="Refresh">
+<input type="submit" name="attrs" value="Review">&nbsp;
+<input type="submit" name="attrs" value="Refresh">
 </form>
 END
 
-    my $diropen = "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_diropen.db";
-
-    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 $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 ($hash{'display_attrs_0'} == 1);
+    $r->print("<td bgcolor=$titleclr><b>Last accessed</b></td>\n") if ($hash{'display_attrs_1'} == 1);
+    $r->print("<td bgcolor=$titleclr><b>Last modified</b></td>\n") if ($hash{'display_attrs_2'} == 1);
+    $r->print("<td bgcolor=$titleclr><b>Author(s)</b></td>\n") if ($hash{'display_attrs_3'} == 1);
+    $r->print("<td bgcolor=$titleclr><b>Keywords</b></td>\n") if ($hash{'display_attrs_4'} == 1);
+    $r->print("<td bgcolor=$titleclr><b>Language</b></td>\n") if ($hash{'display_attrs_5'} == 1);
+    $r->print("</tr>");
 
 	map {
 	    if ($_ =~ /^diropen_status_/) {
@@ -143,6 +155,7 @@ END
     return OK;
 }
 
+
 # --------------------recursive scan of a directory
 sub scanDir {
     my ($r,$startdir,$indent)=@_;
@@ -153,9 +166,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 +176,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);
@@ -181,7 +197,7 @@ sub get_list {
     my $luri = $uri;
     $luri =~ s/\//_/g;
 
-    if ($ENV{'form.dirlistattr'} eq "Refresh") {
+    if ($ENV{'form.attrs'} eq "Refresh") {
 	map {
 	    delete $hash{$_} if ($_ =~ /^dirlist_files_/);
 	    } keys %hash;
@@ -254,8 +270,9 @@ sub display_line{
     my $i=0;
 
     while ($i<=5) {
-	my $key="form.attr".$i;
-	$tabtag=join('',$tabtag,"<td bgcolor=",$fileclr,">&nbsp;</td>") if $ENV{$key} == 1;
+#	my $key="form.attr".$i;
+#	$tabtag=join('',$tabtag,"<td bgcolor=",$fileclr,">&nbsp;</td>") if $ENV{$key} == 1;
+	$tabtag=join('',$tabtag,"<td bgcolor=",$fileclr,">&nbsp;</td>") if $hash{'display_attrs_'.$i} == 1;
 	$i++;
     }
     if ($filecom[1] eq "domain") {
@@ -313,21 +330,22 @@ sub display_line{
 	$r->print (" (<a href=\"javascript:openWindow('".$filelink.".meta', 'metadatafile', '400', '450', 'no', 'yes')\"; TARGET=_self>metadata</a>) ") if ($metafile == 1);
 
 	$r=>print("</td>\n");
-	$r->print("<td bgcolor=$fileclr align=right valign=bottom> ",$filecom[8]," </td>\n") if $ENV{'form.attr0'} == 1;
-	$r->print("<td bgcolor=$fileclr valign=bottom> ".(localtime($filecom[9]))." </td>\n") if $ENV{'form.attr1'} == 1;
-	$r->print("<td bgcolor=$fileclr valign=bottom> ".(localtime($filecom[10]))." </td>\n") if $ENV{'form.attr2'} == 1;
+#	$r->print("<td bgcolor=$fileclr align=right valign=bottom> ",$filecom[8]," </td>\n") if $ENV{'form.attr0'} == 1;
+	$r->print("<td bgcolor=$fileclr align=right valign=bottom> ",$filecom[8]," </td>\n") if $hash{'display_attrs_0'} == 1;
+	$r->print("<td bgcolor=$fileclr valign=bottom> ".(localtime($filecom[9]))." </td>\n") if $hash{'display_attrs_1'} == 1;
+	$r->print("<td bgcolor=$fileclr valign=bottom> ".(localtime($filecom[10]))." </td>\n") if $hash{'display_attrs_2'} == 1;
 
-	if ($ENV{'form.attr3'} == 1) {
+	if ($hash{'display_attrs_3'} == 1) {
 	    my $author = &Apache::lonnet::metadata($filelink,'author') if ($metafile == 1);
 	    $author = '&nbsp;' if (!$author);
 	    $r->print("<td bgcolor=$fileclr valign=bottom> ".$author." </td>\n");
 	}
-	if ($ENV{'form.attr4'} == 1) {
+	if ($hash{'display_attrs_4'} == 1) {
 	    my $keywords = &Apache::lonnet::metadata($filelink,'keywords') if ($metafile == 1);
 	    $keywords = '&nbsp;' if (!$keywords);
 	    $r->print("<td bgcolor=$fileclr valign=bottom> ".$keywords." </td>\n");
 	}
-	if ($ENV{'form.attr5'} == 1) {
+	if ($hash{'display_attrs_5'} == 1) {
 	    my $lang = &Apache::lonnet::metadata($filelink,'language') if ($metafile == 1);
 	    $lang = $language{$lang};
 	    $lang = '&nbsp;' if (!$lang);
@@ -376,9 +394,9 @@ sub begin_form {
     $r->print ("<form method=\"post\" name=\"dirpath\" action=\"/res/\#$anchor\" enctype=\"application/x-www-form-urlencoded\">\n");
     $r->print ("<input type=hidden name=openuri value=\"$uri\">\n");
 
-    for (my $i=0; $i<=5; $i++) {
-	$r->print ("<input type=hidden name=attr$i value=\"1\">\n") if $ENV{'form.attr'.$i} == 1;
-    }
+#    for (my $i=0; $i<=5; $i++) {
+#	$r->print ("<input type=hidden name=attr$i value=\"1\">\n") if $ENV{'form.attr'.$i} == 1;
+#    }
 }
 
 1;