--- loncom/interface/lonindexer.pm	2001/06/15 19:05:26	1.10
+++ loncom/interface/lonindexer.pm	2001/06/26 21:11:18	1.12
@@ -12,6 +12,7 @@
 # 06/01/2001 Scott Harrison
 # 06/02/2001 Scott Harrison
 # 06/15/2001 Scott Harrison
+# 06/26/2001 H. K. Ng
 
 package Apache::lonindexer;
 
@@ -50,7 +51,6 @@ sub handler {
     my $lonhost = $r->dir_config('lonHostID');
     my $tabdir  = $r->dir_config('lonTabDir');
 
-#    my $iconpath='/res/adm/pages/indexericons/';
     my $fileclr='#ffffe6';
 # -------------------------------------- see if called from an interactive mode
     map {
@@ -182,11 +182,11 @@ 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 $diropen = "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db";
+    my $diropendb = "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db";
 
-    if (tie(%hash,'GDBM_File',$diropen,&GDBM_WRCREAT,0640)) {
+    if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT,0640)) {
 
 	if ($ENV{'form.attrs'} ne "") {
 	    for (my $i=0; $i<=5; $i++) {
@@ -256,11 +256,23 @@ END
 		$dirs{$uri} = 'open';
 	    }
 	}
-
-	my $toplevel = "/res/";
+	
+	my $bredir = $ENV{'form.dirPointer'};
+	my $toplevel;
+	$uri = $uri.'/' if $uri !~ /.*\/$/;
+	if ($uri eq "/res/" or $bredir ne "on") {
+	    $hash{'top.level'} = $uri;
+	    $toplevel = $uri;
+	} elsif ($bredir eq "on") {
+	    if ($hash{'top.level'} eq "/res/") {
+		$toplevel = "/res/";
+	    } else {
+		$toplevel = $uri;
+	    }
+	}
 	my $indent = 0;
 	&scanDir ($r,$toplevel,$indent);
-
+	
 	$r->print("<form name='fnum'>");
 	$r->print("<input type='hidden' name='fnum' value='$fnum'></form>");
 	$r->print("</table>");
@@ -290,20 +302,20 @@ 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 = 0;
+	my $diropen = "closed";
 	if (($dirptr&$testdir) or ($dom =~ /^(domain|user)$/)) {
 	    while (my ($key,$val)= each %dupdirs) {
 		if ($key eq $compuri and $val eq "open") {
-		    $diropen = 1;
+		    $diropen = "opened";
 		    delete $dupdirs{key},$dirs{$key};
 		}
 	    }
 	}
 	&display_line($r,$diropen,$line,$indent,$curdir,@list);
-	&scanDir ($r,$compuri,$indent) if $diropen == 1;
+	&scanDir ($r,$compuri,$indent) if $diropen eq "opened";
     }
     $indent--;
 }
@@ -339,7 +351,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>;
@@ -376,21 +388,18 @@ sub display_line{
     my $dirptr=16384;
     my $fileclr="#ffffe6";
     my $iconpath= $r->dir_config('lonIconsURL') . "/";
-#    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 $msg = 'View '.$filecom[0].' resources';
-    $msg = 'Close '.$filecom[0].' directory' if $diropen == 1;
+    $msg = 'Close '.$filecom[0].' directory' if $diropen eq "opened";
 
     my $tabtag="</td>";
     my $i=0;
 
     while ($i<=5) {
-#	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++;
     }
@@ -400,8 +409,8 @@ sub display_line{
 	&begin_form ($r,$filecom[0].'/');
 	my $anchor = $filecom[0].'/';
 	$anchor =~ s/\///g;
-	$r->print ("<a name=\"".$anchor."\">\n<input src=\"".$iconpath."server.gif\"");
-	$r->print (" name=\"$msg\" height=\"22\" type=\"image\" border=\"0\">\n");
+	$r->print ('<a name="'.$anchor.'"><input src="'.$iconpath.'server.gif"');
+	$r->print (' name="'.$msg.'" height="22" type="image" border="0">'."\n");
 	$r->print("Domain - $listname $tabtag</tr></form>\n");
 	return OK;
     }
@@ -412,14 +421,10 @@ sub display_line{
 	&begin_form ($r,$curdir);
 	my $anchor = $curdir;
 	$anchor =~ s/\///g;
-#	$r->print ("<a name=\"$anchor\">\n<img src=",$iconpath,"white_space_20_22.gif border=0>\n");
-	$r->print ("<a name=\"$anchor\">\n<img src=",$iconpath,"whitespace1.gif border=0>\n");
-	$r->print ("<input src=\"$iconpath");
-	$r->print ("folder_pointer_closed.gif\"") if $diropen == 0;
-	$r->print ("folder_pointer_opened.gif\"") if $diropen == 1;
-	$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 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>'.$listname.$tabtag.'</tr></form>'."\n");
 	return OK;
     }
 # display file
@@ -455,9 +460,9 @@ sub display_line{
   	    $fnum++;
 	}
 
-	if ($indent < 11) {
+	if ($indent > 0 and $indent < 11) {
 	    $r->print("<img src=",$iconpath,"whitespace",$indent,".gif border=0>\n");
-	} else {
+	} elsif ($indent >0) {
 	    my $ten = int($indent/10.);
 	    my $rem = $indent%10.0;
 	    my $count = 0;
@@ -469,15 +474,17 @@ 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);
 
 	$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 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;
+	$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 ($hash{'display_attrs_3'} == 1) {
 	    my $author = &Apache::lonnet::metadata($filelink,'author') if ($metafile == 1);
@@ -507,7 +514,7 @@ sub display_line{
 	$r->print("<tr>$extrafield<td bgcolor=$fileclr valign=bottom>");
 	&begin_form ($r,$curdir);
 	my $indentm1 = $indent-1;
-	if ($indentm1 < 11) {
+	if ($indentm1 < 11 and $indentm1 > 0) {
 	    $r->print("<img src=",$iconpath,"whitespace",$indentm1,".gif border=0>\n");
 	} else {
 	    my $ten = int($indentm1/10.);
@@ -515,16 +522,13 @@ sub display_line{
 	    my $count = 0;
 	    while ($count < $ten) {
 		$r->print("<img src=",$iconpath,"whitespace10.gif border=0>\n");
-	    $count++;
+		$count++;
 	    }
 	    $r->print("<img src=",$iconpath,"whitespace",$rem,".gif border=0>\n") if $rem > 0;
 	}
-	$r->print ("<a name=\"$anchor\">\n<input src=\"$iconpath");
-	$r->print ("folder_pointer_closed.gif\"") if $diropen == 0;
-	$r->print ("folder_pointer_opened.gif\"") if $diropen == 1;
-	$r->print (" name=\"$msg\" height=\"22\" type=\"image\" border=\"0\">\n");
-	$r->print("<img src=",$iconpath,"folder_closed.gif border=0>\n") if $diropen == 0;
-	$r->print("<img src=",$iconpath,"folder_opened.gif border=0>\n") if $diropen == 1;
+	$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");
     }
 
@@ -535,13 +539,14 @@ 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");
 
-#    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;
 __END__
+
+
+