--- loncom/interface/lonindexer.pm	2001/06/21 20:57:12	1.11
+++ loncom/interface/lonindexer.pm	2001/07/08 18:31:10	1.13
@@ -12,6 +12,8 @@
 # 06/01/2001 Scott Harrison
 # 06/02/2001 Scott Harrison
 # 06/15/2001 Scott Harrison
+# 06/26/2001 H. K. Ng
+# 07/08/2001 H. K. Ng
 
 package Apache::lonindexer;
 
@@ -181,7 +183,7 @@ ENDHEADER
     my (@attrchk,@openpath);
     my $uri=$r->uri;
 
-    $r->print("<h2><font color=\"\#888888\">The LearningOnline With CAPA Network Directory Browser</font></h2>\n");
+    $r->print('<h2><font color="#888888">The LearningOnline With CAPA Network Directory Browser</font></h2>'."\n");
 
     my $diropendb = "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db";
 
@@ -212,6 +214,7 @@ 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=dirPointer value="on">
 <input type="submit" name="attrs" value="Review">&nbsp;
 <input type="submit" name="attrs" value="Refresh">
 $hidden
@@ -255,12 +258,28 @@ END
 		$dirs{$uri} = 'open';
 	    }
 	}
-
-#	my $toplevel = "/res/";
-	my $toplevel = $uri;
+	
+	my $bredir = $ENV{'form.dirPointer'};
+	my $toplevel;
 	my $indent = 0;
-	&scanDir ($r,$toplevel,$indent);
+	$uri = $uri.'/' if $uri !~ /.*\/$/;
+	if ($bredir ne "on") {
+	    $hash{'top.level'} = $uri;
+	    $toplevel = $uri;
 
+	} else {
+	    $toplevel = $hash{'top.level'};
+	}
+	if ($toplevel ne "/res/"){
+	    my (@uri_com) = split(/\//,$uri);
+	    pop @uri_com;
+	    my $upone = join('/',@uri_com);
+	    my @list = qw (0);
+	    &display_line ($r,'opened',$upone.'&viewOneUp',0,$upone,@list);
+	    $indent = 1;
+	}
+	&scanDir ($r,$toplevel,$indent);
+	
 	$r->print("<form name='fnum'>");
 	$r->print("<input type='hidden' name='fnum' value='$fnum'></form>");
 	$r->print("</table>");
@@ -290,7 +309,7 @@ sub scanDir {
 	    $compuri = join('',$strip,"/");  # domain list has /res/<domain name>
 	    $curdir = $compuri;
 	} else {
-	    $compuri = join('',$startdir,$strip,"/"); # user, dir & file having name only, i.e., w/o path
+	    $compuri = join('',$startdir,$strip,"/"); # user, dir & file have name only, i.e., w/o path
 	    $curdir = $startdir;
 	}
 	my $diropen = "closed";
@@ -339,7 +358,7 @@ sub match_ext {
     my $dirptr=16384;
 
     my $tabdir  = $r->dir_config('lonTabDir');
-    my $fn = $tabdir."/filetypes.tab";
+    my $fn = $tabdir.'/filetypes.tab';
     if (-e $fn) {
 	my $FH=Apache::File->new($fn);
 	my @content=<$FH>;
@@ -391,29 +410,44 @@ sub display_line{
 	$tabtag=join('',$tabtag,"<td bgcolor=",$fileclr,">&nbsp;</td>") if $hash{'display_attrs_'.$i} == 1;
 	$i++;
     }
+    if ($filecom[1] eq "viewOneUp") {
+	$r->print("<tr>$extrafield");
+	$r->print("<td bgcolor=$fileclr valign=bottom>\n");
+	$r->print ('<form method="post" name="dirpath" action="'.$startdir.
+		   '" enctype="application/x-www-form-urlencoded">'."\n");
+	$r->print ($hidden.'<input type=hidden name=openuri value="'.$startdir.'">'."\n");
+	$r->print ('<input src="'.$iconpath.'arrow_up.gif"');
+	$r->print (' name="'.$msg.'" height="22" type="image" border="0">'."\n");
+	$r->print("Up $tabtag</tr></form>\n");
+	return OK;
+    }
     if ($filecom[1] eq "domain") {
+	$r->print ('<input type=hidden name=dirPointer value="on">'."\n") if ($ENV{'form.dirPointer'} eq "on");
 	$r->print("<tr>$extrafield");
 	$r->print("<td bgcolor=$fileclr valign=bottom>");
 	&begin_form ($r,$filecom[0].'/');
 	my $anchor = $filecom[0].'/';
 	$anchor =~ s/\///g;
-	$r->print ('<a name="'.$anchor.'"><input src="'.$iconpath.'server.gif"');
+	$r->print ('<a name="'.$anchor.'">');
+	$r->print ('<input src="'.$iconpath.'folder_pointer_'.$diropen.'.gif"'); 
 	$r->print (' name="'.$msg.'" height="22" type="image" border="0">'."\n");
+	$r->print ('<a href="'.$filecom[0].'"><img src="'.$iconpath.'server.gif"');
+	$r->print (' border="0"></a>'."\n");
 	$r->print("Domain - $listname $tabtag</tr></form>\n");
 	return OK;
     }
     if ($filecom[1] eq "user") {
 	$r->print("<tr>$extrafield");
-	$r->print("<td bgcolor=$fileclr valign=bottom>\n");
+	$r->print("<td bgcolor=$fileclr valign=bottom nowrap>\n");
 	my $curdir = $startdir.$filecom[0].'/';
-	&begin_form ($r,$curdir);
 	my $anchor = $curdir;
 	$anchor =~ s/\///g;
+	&begin_form ($r,$curdir);
 	$r->print ('<a name="'.$anchor.'"><img src="'.$iconpath.'whitespace1.gif" border=0>'."\n");
 	$r->print ('<input src="'.$iconpath.'folder_pointer_'.$diropen.'.gif"'); 
 	$r->print (' name="'.$msg.'" height="22" type="image" border="0">'."\n");
-	$r->print ("<img src=",$iconpath,"quill.gif border=0>\n");
-	$r->print ("$listname $tabtag</tr></form>\n");
+	$r->print ('<a href="'.$curdir.'"><img src='.$iconpath.'quill.gif border=0 name="'.$msg.'" height="22"></a>');
+	$r->print ($listname.$tabtag.'</tr></form>'."\n");
 	return OK;
     }
 # display file
@@ -449,7 +483,7 @@ sub display_line{
   	    $fnum++;
 	}
 
-	if ($indent < 11) {
+	if ($indent > 0 and $indent < 11) {
 	    $r->print("<img src=",$iconpath,"whitespace",$indent,".gif border=0>\n");
 	} elsif ($indent >0) {
 	    my $ten = int($indent/10.);
@@ -463,7 +497,7 @@ sub display_line{
 	}
 
 	$r->print("<img src=$iconpath$curfext.gif border=0>\n");
-	$r->print(" <a href=$filelink target='_blank'>",$listname,"</a>\n");
+	$r->print (" <a href=\"javascript:openWindow('".$filelink."', 'metadatafile', '450', '500', 'no', 'yes')\"; TARGET=_self>$listname</a> ");
 
 	$r->print (" (<a href=\"javascript:openWindow('".$filelink.".meta', 'metadatafile', '400', '450', 'no', 'yes')\"; TARGET=_self>metadata</a>) ") if ($metafile == 1);
 
@@ -510,15 +544,15 @@ sub display_line{
 	    my $rem = $indentm1%10.0;
 	    my $count = 0;
 	    while ($count < $ten) {
-		$r->print("<img src=",$iconpath,"whitespace10.gif border=0>\n");
-	    $count++;
+		$r->print ("<img src=",$iconpath,"whitespace10.gif border=0>\n");
+		$count++;
 	    }
-	    $r->print("<img src=",$iconpath,"whitespace",$rem,".gif border=0>\n") if $rem > 0;
+	    $r->print ("<img src=",$iconpath,"whitespace",$rem,".gif border=0>\n") if $rem > 0;
 	}
 	$r->print ('<a name="'.$anchor.'"><input src="'.$iconpath.'folder_pointer_'.$diropen.'.gif"');
 	$r->print (' name="'.$msg.'" height="22" type="image" border="0">'."\n");
-	$r->print("<img src=",$iconpath,"folder_$diropen.gif border=0>\n");
-	$r->print("$listname $tabtag</tr></form>\n");
+	$r->print ('<a href="'.$curdir.'"><img src="'.$iconpath.'folder_'.$diropen.'.gif" border=0></a>'."\n");
+	$r->print ("$listname$tabtag</tr></form>\n");
     }
 
 }
@@ -528,13 +562,11 @@ sub begin_form {
     my ($r,$uri) = @_;
     my $anchor = $uri;
     $anchor =~ s/\///g;
-    $r->print ('<form method="post" name="dirpath" action="/res/#'.$anchor.'" enctype="application/x-www-form-urlencoded">'."\n");
-    $r->print ("$hidden<input type=hidden name=openuri value=\"$uri\">\n");
-
+    $r->print ('<form method="post" name="dirpath" action="'.$uri.'#'.$anchor.
+	       '" enctype="application/x-www-form-urlencoded">'."\n");
+    $r->print ($hidden.'<input type=hidden name=openuri value="'.$uri.'">'."\n");
+    $r->print ('<input type=hidden name=dirPointer value="on">'."\n");
 }
 
 1;
 __END__
-
-
-