--- loncom/interface/lonindexer.pm 2001/05/19 14:31:45 1.3 +++ loncom/interface/lonindexer.pm 2001/05/21 15:22:48 1.4 @@ -6,6 +6,7 @@ # 07/20-08/04 H.K. Ng # # 05/9-05/19/2001 H. K. Ng +# 05/21/2001 H. K. Ng # package Apache::lonindexer; @@ -15,6 +16,7 @@ use Apache::Constants qw(:common); use Apache::File; use GDBM_File; +my %hash; my %dirs; my %language; @@ -88,9 +90,9 @@ ENDHEADER END - my $diropen = "/home/httpd/perl/tmp/$domain$ENV{'user.name'}_diropen.db"; + my $diropen = "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_diropen.db"; - if (tie(%dirs,'GDBM_File',$diropen,&GDBM_WRCREAT,0640)) { + if (tie(%hash,'GDBM_File',$diropen,&GDBM_WRCREAT,0640)) { my $titleclr="#ddffff"; $r->print("
\n"); $r->print("\n"); @@ -103,26 +105,38 @@ END $r->print("\n") if ($ENV{'form.attr5'} == 1); $r->print(""); + map { + if ($_ =~ /^diropen_status_/) { + my $key = $_; + $key =~ s/^diropen_status_//; + $dirs{$key} = $hash{$_}; + } + } keys %hash; + if ($ENV{'form.openuri'}) { # take care of review and refresh options my $uri=$ENV{'form.openuri'}; - if (exists($dirs{$uri})) { - my $cursta = $dirs{$uri}; + if (exists($hash{'diropen_status_'.$uri})) { + my $cursta = $hash{'diropen_status_'.$uri}; $dirs{$uri} = 'open'; - $dirs{$uri} = 'closed' if $cursta eq 'open'; + $hash{'diropen_status_'.$uri} = 'open'; + if ($cursta eq 'open') { + $dirs{$uri} = 'closed'; + $hash{'diropen_status_'.$uri} = 'closed'; + } } else { + $hash{'diropen_status_'.$uri} = 'open'; $dirs{$uri} = 'open'; } } - sort keys %dirs; my $toplevel = "/res/"; - my $indent = -1; + my $indent = 0; &scanDir ($r,$toplevel,$indent); $r->print("
Language
"); $r->print("
"); $r->print("\n"); - untie(%dirs); + untie(%hash); } else { $r->print("Unable to tie hash to db file"); } @@ -140,6 +154,7 @@ sub scanDir { my @list=&get_list($r,$startdir); foreach my $line (@list) { my ($strip,$domusr,$foo,$testdir,$foo)=split(/\&/,$line,5); + next if $strip =~ /.*\.meta$/; if ($domusr eq "domain") { $compuri = join('',$strip,"/"); # domain list has /res/ $curdir = $compuri; @@ -153,7 +168,7 @@ sub scanDir { $diropen = 1 if ($key eq $compuri and $val eq "open"); } } - &display_line($r,$diropen,$line,$indent,$curdir); + &display_line($r,$diropen,$line,$indent,$curdir,@list); &scanDir ($r,$compuri,$indent) if $diropen == 1; } $indent--; @@ -164,31 +179,20 @@ sub get_list { my ($r,$uri)=@_; my @list; my $luri = $uri; - my $domain = $r->dir_config('lonDefDomain'); $luri =~ s/\//_/g; if ($ENV{'form.dirlistattr'} eq "Refresh") { - my $tmpdir="/home/httpd/perl/tmp"; - my $filename; - opendir(DIR,$tmpdir); - while ($filename=readdir(DIR)) { - if ($filename=~/^$domain$ENV{'user.name'}_dirlist.*\.tmp$/) { - unlink($tmpdir.'/'.$filename); - } - } - closedir(DIR); + map { + delete $hash{$_} if ($_ =~ /^dirlist_files_/); + } keys %hash; } - my $dirlist = "/home/httpd/perl/tmp/$domain$ENV{'user.name'}_dirlist$luri.tmp"; - if (-e $dirlist) { - my $FH = Apache::File->new($dirlist); - @list=<$FH>; + if ($hash{'dirlist_files'.$luri}) { + @list = split(/\n/,$hash{'dirlist_files_'.$luri}); } else { - @list=&Apache::lonnet::dirlist($uri); - my $FH = Apache::File->new(">$dirlist"); - print $FH join("\n",@list); + @list = &Apache::lonnet::dirlist($uri); + $hash{'dirlist_files_'.$luri} = join('\n',@list); } - @list = sort(@list); return @list=&match_ext($r,@list); } @@ -218,7 +222,6 @@ sub match_ext { next if ($unpackline[0] eq ".."); my @filecom = split (/\./,$unpackline[0]); my $fext = pop(@filecom); - next if $fext eq "meta"; my $fnptr = $unpackline[3]&$dirptr; if ($fnptr == 0 and $unpackline[3] ne "") { foreach my $nextline (@fileext) { @@ -228,12 +231,13 @@ sub match_ext { push @trimlist,$line; } } + @trimlist = sort (@trimlist); return @trimlist; } #------------------- displays one line in appropriate table format sub display_line{ - my ($r,$diropen,$line,$indent,$startdir)=@_; + my ($r,$diropen,$line,$indent,$startdir,@list)=@_; my (@pathfn, $fndir, $fnptr); my $dirptr=16384; my $fileclr="#ffffe6"; @@ -243,6 +247,8 @@ sub display_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; my $tabtag=""; my $i=0; @@ -259,7 +265,7 @@ sub display_line{ my $anchor = $filecom[0].'/'; $anchor =~ s/\///g; $r->print ("\nprint (" name=\"View $filecom[0]/ resources\" height=\"22\" type=\"image\" border=\"0\">\n"); + $r->print (" name=\"$msg\" height=\"22\" type=\"image\" border=\"0\">\n"); $r->print("Domain - $listname $tabtag\n"); return OK; } @@ -270,11 +276,12 @@ sub display_line{ &begin_form ($r,$curdir); my $anchor = $curdir; $anchor =~ s/\///g; - $r->print ("\n\n"); +# $r->print ("\n\n"); + $r->print ("\n\n"); $r->print ("print ("folder_pointer_closed.gif\"") if $diropen == 0; $r->print ("folder_pointer_opened.gif\"") if $diropen == 1; - $r->print (" name=\"View $curdir resources\" height=\"22\" type=\"image\" border=\"0\">\n"); + $r->print (" name=\"$msg\" height=\"22\" type=\"image\" border=\"0\">\n"); $r->print ("\n"); $r->print ("$listname $tabtag\n"); return OK; @@ -284,37 +291,44 @@ sub display_line{ my @file_ext = split (/\./,$listname); my $curfext = $file_ext[scalar(@file_ext)-1]; my $filelink = $startdir.$filecom[0]; - my $count = 0; $r->print(""); - while ($count < $indent) { - $r->print("\n"); + + if ($indent < 11) { + $r->print("\n"); + } else { + my $ten = int($indent/10.); + my $rem = $indent%10.0; + my $count = 0; + while ($count < $ten) { + $r->print("\n"); $count++; + } + $r->print("\n") if $rem > 0; } - $r->print("\n"); + $r->print("\n"); - $r->print(" ",$listname,""); - my $metafile = '/home/httpd/html'.$filelink.'.meta'; + $r->print(" ",$listname,"\n"); + my $metafile = grep /^$filecom[0]\.meta\&/, @list; - $r->print (" (metadata) ") if (-e $metafile); + $r->print (" (metadata) ") if ($metafile == 1); -# $r->print(" (metadata)") if (-e $metafile); $r=>print("\n"); $r->print(" ",$filecom[8]," \n") if $ENV{'form.attr0'} == 1; $r->print(" ".(localtime($filecom[9]))." \n") if $ENV{'form.attr1'} == 1; $r->print(" ".(localtime($filecom[10]))." \n") if $ENV{'form.attr2'} == 1; if ($ENV{'form.attr3'} == 1) { - my $author = &Apache::lonnet::metadata($filelink,'author'); + my $author = &Apache::lonnet::metadata($filelink,'author') if ($metafile == 1); $author = ' ' if (!$author); $r->print(" ".$author." \n"); } if ($ENV{'form.attr4'} == 1) { - my $keywords = &Apache::lonnet::metadata($filelink,'keywords'); + my $keywords = &Apache::lonnet::metadata($filelink,'keywords') if ($metafile == 1); $keywords = ' ' if (!$keywords); $r->print(" ".$keywords." \n"); } if ($ENV{'form.attr5'} == 1) { - my $lang = &Apache::lonnet::metadata($filelink,'language'); + my $lang = &Apache::lonnet::metadata($filelink,'language') if ($metafile == 1); $lang = $language{$lang}; $lang = ' ' if (!$lang); $r->print(" ".$lang." \n"); @@ -330,17 +344,23 @@ sub display_line{ $anchor =~ s/\///g; $r->print(""); &begin_form ($r,$curdir); - - my $count = 0; - while ($count < $indent) { - $r->print("\n"); + my $indentm1 = $indent-1; + if ($indentm1 < 11) { + $r->print("\n"); + } else { + my $ten = int($indentm1/10.); + my $rem = $indentm1%10.0; + my $count = 0; + while ($count < $ten) { + $r->print("\n"); $count++; + } + $r->print("\n") if $rem > 0; } - $r->print ("\nprint ("folder_pointer_closed.gif\"") if $diropen == 0; $r->print ("folder_pointer_opened.gif\"") if $diropen == 1; - $r->print (" name=\"View $curdir resources\" height=\"22\" type=\"image\" border=\"0\">\n"); + $r->print (" name=\"$msg\" height=\"22\" type=\"image\" border=\"0\">\n"); $r->print("\n") if $diropen == 0; $r->print("\n") if $diropen == 1; $r->print("$listname $tabtag\n");