--- loncom/homework/Attic/lonindexer.pm	2000/08/02 12:20:28	1.2
+++ loncom/homework/Attic/lonindexer.pm	2000/08/03 21:19:44	1.3
@@ -40,6 +40,7 @@ ENDHEADER
     my $iconpath="/res/adm/pages/indexericons/";
 
     $r->print("<h2>The LearningOnline Network Directory Browser</h2>\n");
+#    $r->print("<hr>Current uri=$uri<br>called uri=$ENV{'form.openuri'}<br>domain=$domain<hr>");
 
     for (my $i=0; $i<=5; $i++) {
 	$attrchk[$i] = "checked" if $ENV{'form.attr'.$i} == 1;
@@ -56,33 +57,37 @@ 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=hidden name=openuri value="$ENV{'form.openuri'}">
 <input type="submit" name="dirlistattr" value="Review">
 </form>
 END
     my $titleclr="#ddffff";
     my $fileclr="#ffffdd";
 
-    $r->print("<table border=0><tr><td bgcolor=#999999>");
-    $r->print("<table border=0><tr>");
+    $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><b>Size (bytes)</b></td>") if ($ENV{'form.attr0'} == 1);
-    $r->print("<td bgcolor=$titleclr><b>Last accessed</b></td>") if ($ENV{'form.attr1'} == 1);
-    $r->print("<td bgcolor=$titleclr><b>Last modified</b></td>") if ($ENV{'form.attr2'} == 1);
+    $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("</tr>");
 
-    if ($ENV{'dirlist.lvl'} eq "") {
-	my %dirlvl;
-	$dirlvl{'dirlist.lvl'}='-2';
-	&Apache::lonnet::appenv(%dirlvl);
+    if ($ENV{'dirlist.level'} eq "") {
+	my %dirlevel;
+	$dirlevel{'dirlist.level'}='-2';
+	&Apache::lonnet::appenv(%dirlevel);
     } else {
-	$ENV{'dirlist.lvl'}='-2';
+	$ENV{'dirlist.level'}='-2';
     }
-#    $r->print ("original uri=$uri");
-    my $uri = &get_openpath($uri);
-#    $r->print ("shortened uri=$shorturi");
-
-    my $domain="/res/";
-    &branch($r,$domain,$uri);
+    if ($ENV{'form.openuri'} =~ /$uri\&/) {
+	my @pathcom = split(/\//,$uri);
+	pop @pathcom;
+	my $splituri = join ('/',@pathcom);
+	$uri = join ('',$splituri,"/");
+    }
+    &display_line ($r,1,"/res/".$domain."&domain");
+#    $domain="/res/".$domain."/";
+    &branch($r,"/res/".$domain."/",$uri);
 
     $r->print("</table>");
     $r->print("</td></tr></table>");
@@ -100,16 +105,14 @@ sub branch {
     my ($line,@list);
     my ($domusr,$foo,$strip,$testdir,$compuri,$chkdir,$diropen);
     my $dirptr=16384;
-#    my $calluri=$r->uri;
-    $ENV{'dirlist.lvl'}++;
+    $ENV{'dirlist.level'}++;
 
-    @list=&get_list($uri);
+    @list=&get_list($r,$uri);
     foreach $line (@list) {
 	chomp $line;
 
 	($strip,$domusr,$foo,$testdir,$foo)=split(/\&/,$line,5);
 	$compuri=join("",$strip,"/");
-	
 	$chkdir=$testdir&$dirptr;
 	if ($domusr eq "domain" or $domusr eq "user") {
 	    $chkdir = $dirptr;
@@ -121,12 +124,12 @@ sub branch {
 
 	&branch($r,$compuri,$calluri) if ($calluri =~ $compuri and $calluri=~/^$uri/ and $chkdir == $dirptr and $testdir ne "");
     }
-    $ENV{'dirlist.lvl'}--;
+    $ENV{'dirlist.level'}--;
 }
 
 # ------ get complete list based on the uri ------
 sub get_list {
-    my $uri=shift;
+    my ($r,$uri)=@_;
     my @list;
     my $luri=$uri;
     $luri=~s/\//_/g;
@@ -139,7 +142,7 @@ sub get_list {
 	my $FH = Apache::File->new(">$dirlist");
 	print $FH join("\n",@list);
     }
-    return @list=&match_ext(@list);
+    return @list=&match_ext($r,@list);
 }
 
 # ------ get previously opened path, if any ------
@@ -173,14 +176,15 @@ sub get_openpath {
 }
 
 sub match_ext {
-    my @packlist=@_;
+    my ($r,@packlist)=@_;
     my $line;
     my @trimlist;
     my $nextline;
     my @fileext;
     my $dirptr=16384;
 
-    my $fn="/home/httpd/lonTabs/filetypes.tab";
+    my $tabdir  = $r->dir_config('lonTabDir');
+    my $fn = $tabdir."/filetypes.tab";
     if (-e $fn) {
 	my $FH=Apache::File->new($fn);
 	my @content=<$FH>;
@@ -211,16 +215,16 @@ sub match_ext {
 
 sub display_line{
     my ($r,$diropen,$line)=@_;
-    my (@pathfn, $fndir, $fnptr, $disattr);
+    my (@pathfn, $fndir, $fnptr);
     my $dirptr=16384;
-    my $fileclr="#ffffdd";
+    my $fileclr="#ffffe6";
     my $iconpath="/res/adm/pages/indexericons/";
 
     my @filecom = split (/\&/,$line);
     my @pathcom = split (/\//,$filecom[0]);
     my $listname = $pathcom[scalar(@pathcom)-1];
     my $fnptr = $filecom[3]&$dirptr;
-    my $indent = $ENV{'dirlist.lvl'};
+    my $indent = $ENV{'dirlist.level'};
 
     my $tabtag="</td>";
     my $nextline;
@@ -228,30 +232,36 @@ sub display_line{
 
     while ($i<=5) {
 	my $key="form.attr".$i;
-	$i++;
 	$tabtag=join('',$tabtag,"<td bgcolor=",$fileclr,">&nbsp;</td>") if $ENV{$key} == 1;
+	$i++;
     }
 
     if ($filecom[1] eq "domain") {
 	$r->print("<tr>");
-	$r->print("<td bgcolor=$fileclr valign=bottom><a href=$filecom[0]/><img src=$iconpath","comp.blue.gif border=0></a>\n");
-	$r->print("Domain - $listname $tabtag</tr>");
+	$r->print("<td bgcolor=$fileclr valign=bottom>");
+	&begin_form ($r,$filecom[0]);
+	$r->print ("<input src=\"$iconpath");
+	$r->print ("comp.blue.gif\"");
+	$r->print (" name=\"submit\" height=\"22\" type=\"image\" border=\"0\">\n");
+	$r->print("Domain - $listname $tabtag</tr></form>\n");
 	return OK;
     }
 
     if ($filecom[1] eq "user") {
 	$r->print("<tr>");
 	$r->print("<td bgcolor=$fileclr valign=bottom>\n");
+	&begin_form ($r,$filecom[0]);
 	my $count = 0;
-	while ($count <= $ENV{'dirlist.lvl'}) {
+	while ($count <= $ENV{'dirlist.level'}) {
 	    $r->print("<img src=",$iconpath,"white_space_20_22.gif border=0>\n");
 	    $count++;
 	}
-	$r->print("<a href=$filecom[0]/><img src=$iconpath");
-	$r->print("right.gif border=0></a>\n") if $diropen == 0;
-	$r->print("down.gif border=0></a>\n") if $diropen == 1;
+	$r->print ("<input src=\"$iconpath");
+	$r->print ("right.gif\"") if $diropen == 0;
+	$r->print ("down.gif\"") if $diropen == 1;
+	$r->print (" name=\"submit\" height=\"22\" type=\"image\" border=\"0\">\n");
 	$r->print("<img src=",$iconpath,"quill.gif border=0>\n");
-	$r->print("$listname $tabtag</tr>");
+	$r->print("$listname $tabtag</tr></form>\n");
 	return OK;
     }
 
@@ -261,36 +271,58 @@ sub display_line{
 	my $curfext = $file_ext[scalar(@file_ext)-1];
 	my $count = 0;
 	$r->print("<tr><td bgcolor=$fileclr>");
-	while ($count <= $ENV{'dirlist.lvl'}) {
+	while ($count <= $ENV{'dirlist.level'}) {
 	    $r->print("<img src=",$iconpath,"white_space_20_22.gif border=0>\n");
 	    $count++;
 	}
 	$r->print("<img src=",$iconpath,"white_space_20_22.gif border=0>\n");
 	$r->print("<img src=$iconpath$curfext.gif border=0>\n");
-	$r->print(" <a href=$filecom[0]>",$listname,"</a> </td>");
-	$r->print("<td bgcolor=$fileclr align=right valign=bottom> ",$filecom[8]," </td>") if $ENV{'form.attr0'} == 1;
-	$r->print("<td bgcolor=$fileclr valign=bottom> ".(localtime($filecom[9]))." </td>") if $ENV{'form.attr1'} == 1;
-	$r->print("<td bgcolor=$fileclr valign=bottom> ".(localtime($filecom[10]))." </td>") if $ENV{'form.attr2'} == 1;
-	$r->print("</tr>");
+	$r->print(" <a href=$filecom[0]>",$listname,"</a> </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("</tr>\n");
     }
 
 # display directory
     if ($fnptr == $dirptr) {
 	my @file_ext = split (/\./,$listname);
 	my $curfext = $file_ext[scalar(@file_ext)-1];
-
 	$r->print("<tr><td bgcolor=$fileclr valign=bottom>");
+	&begin_form ($r,$filecom[0]);
+
 	my $count = 0;
-	while ($count <= $ENV{'dirlist.lvl'}) {
+	while ($count <= $ENV{'dirlist.level'}) {
 	    $r->print("<img src=",$iconpath,"white_space_20_22.gif border=0>\n");
 	    $count++;
 	}
-	$r->print("<a href=$filecom[0]/><img src=$iconpath");
-	$r->print("right.gif border=0></a>\n") if $diropen == 0;
-	$r->print("down.gif border=0></a>\n") if $diropen == 1;
+
+	$r->print ("<input src=\"$iconpath");
+	$r->print ("right.gif\"") if $diropen == 0;
+	$r->print ("down.gif\"") if $diropen == 1;
+	$r->print (" name=\"submit\" height=\"22\" type=\"image\" border=\"0\">\n");
 	$r->print("<img src=",$iconpath,"folder.gif border=0>\n") if $diropen == 0;
 	$r->print("<img src=",$iconpath,"folder.open.gif border=0>\n") if $diropen == 1;
-	$r->print("$listname $tabtag</tr>");
+	$r->print("$listname $tabtag</tr></form>\n");
+    }
+}
+
+sub begin_form {
+    my ($r,$uri) = @_;
+    my $currenturi = $r->uri;
+    my $openuri = $ENV{'form.openuri'};
+    if ($ENV{'form.openuri'} =~ /$currenturi\&/) {
+	$openuri =~ s/$currenturi\&//;
+    } else {
+	$currenturi = join ('',$currenturi,"&");
+	$openuri = join ('&',$ENV{'form.openuri'},$currenturi);
+	$openuri =~ s/\&+/\&/g;
+    }
+    $r->print ("<form method=\"post\" name=\"dirpath\" action=\"$uri/\" enctype=\"application/x-www-form-urlencoded\">\n");
+    $r->print ("<input type=hidden name=openuri value=\"$openuri\">\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;
     }
 }
 
@@ -311,3 +343,6 @@ sub display_env {
 1;
 __END__
 
+
+
+