--- loncom/interface/lonindexer.pm 2001/05/19 14:31:45 1.3 +++ loncom/interface/lonindexer.pm 2001/08/07 14:02:27 1.14 @@ -1,12 +1,22 @@ # The LearningOnline Network with CAPA +# # Directory Indexer # (Login Screen +# # 5/21/99,5/22,5/25,5/26,5/31,6/2,6/10,7/12,7/14 Gerd Kortemeyer) # 11/23 Gerd Kortemeyer # 07/20-08/04 H.K. Ng # # 05/9-05/19/2001 H. K. Ng -# +# 05/21/2001 H. K. Ng +# 05/23/2001 H. K. Ng +# 05/31/2001 Scott Harrison +# 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; use strict; @@ -15,11 +25,15 @@ use Apache::Constants qw(:common); use Apache::File; use GDBM_File; +my %hash; my %dirs; my %language; - +my $hidden; +my $extrafield; +my $fnum; sub BEGIN { - my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/language.tab'); + my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}. + '/language.tab'); map { $_=~/(\w+)\s+([\w\s\-]+)/; $language{$1}=$2; @@ -31,8 +45,8 @@ sub handler { $r->content_type('text/html'); $r->send_http_header; return OK if $r->header_only; - - my $iconpath= $r->dir_config('lonIconsURL'); + $fnum=0; + my $iconpath= $r->dir_config('lonIconsURL') . "/"; my $domain = $r->dir_config('lonDefDomain'); my $role = $r->dir_config('lonRole'); my $loadlim = $r->dir_config('lonLoadLim'); @@ -41,13 +55,122 @@ sub handler { my $lonhost = $r->dir_config('lonHostID'); my $tabdir = $r->dir_config('lonTabDir'); + my $fileclr='#ffffe6'; +# -------------------------------------- see if called from an interactive mode + map { + my ($name, $value) = split(/=/,$_); + $value =~ tr/+/ /; + $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg; + if ($name eq 'catalogmode') { + $ENV{'form.'.$name}=$value; + } + } (split(/&/,$ENV{'QUERY_STRING'})); + + $hidden=''; my $closebutton=''; + my $groupimportbutton=''; + my $colspan=''; + + $extrafield=''; + if ($ENV{'form.catalogmode'} eq 'interactive') { + $extrafield=''. + ''; + $colspan=" colspan='2' "; + $hidden=< +END + $closebutton=< +END + } + elsif ($ENV{'form.catalogmode'} eq 'groupimport') { + $extrafield=''. + ''; + $colspan=" colspan='2' "; + $hidden=< +END + $closebutton=< +END + $groupimportbutton=< +END + } + + my $catalogmodefunctions=''; + if ($ENV{'form.catalogmode'} eq 'interactive' or + $ENV{'form.catalogmode'} eq 'groupimport') { + $catalogmodefunctions=<print(< The LearningOnline Network With CAPA Directory Browser - + @@ -64,13 +187,26 @@ ENDHEADER my $line; my (@attrchk,@openpath); my $uri=$r->uri; - my $iconpath="/res/adm/pages/indexericons/"; - $r->print("

The LearningOnline With CAPA Network Directory Browser

\n"); + $r->print('

The LearningOnline With CAPA Network Directory Browser

'."\n"); - for (my $i=0; $i<=5; $i++) { - $attrchk[$i] = "checked" if $ENV{'form.attr'.$i} == 1; - } + my $diropendb = "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db"; + + if (tie(%hash,'GDBM_File',$diropendb,&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(<Display file attributes
@@ -83,52 +219,85 @@ ENDHEADER Keywords Language -  - + +  + +$hidden +$closebutton +$groupimportbutton
END - my $diropen = "/home/httpd/perl/tmp/$domain$ENV{'user.name'}_diropen.db"; - - if (tie(%dirs,'GDBM_File',$diropen,&GDBM_WRCREAT,0640)) { - my $titleclr="#ddffff"; - $r->print(""; my $i=0; while ($i<=5) { - my $key="form.attr".$i; - $tabtag=join('',$tabtag,"") if $ENV{$key} == 1; + $tabtag=join('',$tabtag,"") if $hash{'display_attrs_'.$i} == 1; $i++; } + if ($filecom[1] eq "viewOneUp") { + $r->print("$extrafield"); + $r->print("\n"); + return OK; + } if ($filecom[1] eq "domain") { - $r->print(""); + $r->print (''."\n") if ($ENV{'form.dirPointer'} eq "on"); + $r->print("$extrafield"); $r->print("\n"); return OK; } if ($filecom[1] eq "user") { - $r->print(""); - $r->print("$extrafield"); + $r->print("\n"); + &begin_form ($r,$curdir); + $r->print (''."\n"); + $r->print ('print (' name="'.$msg.'" height="22" type="image" border="0">'."\n"); + $r->print (''); + $r->print ($listname.$tabtag.''."\n"); return OK; } # display file @@ -284,37 +460,72 @@ 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("\n"); - $r->print("\n") if $ENV{'form.attr0'} == 1; - $r->print("\n") if $ENV{'form.attr1'} == 1; - $r->print("\n") if $ENV{'form.attr2'} == 1; + $r->print("\n"); + $r->print("\n") + if $hash{'display_attrs_0'} == 1; + $r->print("\n") + if $hash{'display_attrs_1'} == 1; + $r->print("\n") + if $hash{'display_attrs_2'} == 1; - if ($ENV{'form.attr3'} == 1) { - my $author = &Apache::lonnet::metadata($filelink,'author'); + if ($hash{'display_attrs_3'} == 1) { + my $author = &Apache::lonnet::metadata($filelink,'author') if ($metafile == 1); $author = ' ' if (!$author); $r->print("\n"); } - if ($ENV{'form.attr4'} == 1) { - my $keywords = &Apache::lonnet::metadata($filelink,'keywords'); + if ($hash{'display_attrs_4'} == 1) { + my $keywords = &Apache::lonnet::metadata($filelink,'keywords') if ($metafile == 1); $keywords = ' ' if (!$keywords); $r->print("\n"); } - if ($ENV{'form.attr5'} == 1) { - my $lang = &Apache::lonnet::metadata($filelink,'language'); + if ($hash{'display_attrs_5'} == 1) { + my $lang = &Apache::lonnet::metadata($filelink,'language') if ($metafile == 1); $lang = $language{$lang}; $lang = ' ' if (!$lang); $r->print("\n"); @@ -328,37 +539,38 @@ sub display_line{ my $curdir = $startdir.$filecom[0].'/'; my $anchor = $curdir; $anchor =~ s/\///g; - $r->print("$extrafield\n"); + $r->print ('print (' name="'.$msg.'" height="22" type="image" border="0">'."\n"); + $r->print (''."\n"); + $r->print ("$listname$tabtag\n"); } } -#---------------------prints the beginning of a form for directory or file link +# ------------------- prints the beginning of a form for directory or file link sub begin_form { my ($r,$uri) = @_; my $anchor = $uri; $anchor =~ s/\///g; - $r->print ("\n"); - $r->print ("\n"); - - for (my $i=0; $i<=5; $i++) { - $r->print ("\n") if $ENV{'form.attr'.$i} == 1; - } + $r->print (''."\n"); + $r->print ($hidden.''."\n"); + $r->print (''."\n"); } 1;
\n"); - $r->print("\n"); - $r->print("\n"); - $r->print("\n") if ($ENV{'form.attr0'} == 1); - $r->print("\n") if ($ENV{'form.attr1'} == 1); - $r->print("\n") if ($ENV{'form.attr2'} == 1); - $r->print("\n") if ($ENV{'form.attr3'} == 1); - $r->print("\n") if ($ENV{'form.attr4'} == 1); - $r->print("\n") if ($ENV{'form.attr5'} == 1); - $r->print(""); + my $titleclr="#ddffff"; + $r->print("
NameSize (bytes) Last accessedLast modifiedAuthor(s)KeywordsLanguage
\n"); + $r->print("\n"); + $r->print("\n"); + $r->print("\n") if ($hash{'display_attrs_0'} == 1); + $r->print("\n") if ($hash{'display_attrs_1'} == 1); + $r->print("\n") if ($hash{'display_attrs_2'} == 1); + $r->print("\n") if ($hash{'display_attrs_3'} == 1); + $r->print("\n") if ($hash{'display_attrs_4'} == 1); + $r->print("\n") if ($hash{'display_attrs_5'} == 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 $bredir = $ENV{'form.dirPointer'}; + my $toplevel; + my $indent = 0; + $uri = $uri.'/' if $uri !~ /.*\/$/; + if ($bredir ne "on") { + $hash{'top.level'} = $uri; + $toplevel = $uri; - my $toplevel = "/res/"; - my $indent = -1; + } 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(""); + $r->print(""); $r->print("
NameSize (bytes) Last accessedLast modifiedAuthor(s)KeywordsLanguage
"); $r->print("
"); $r->print("\n"); - untie(%dirs); + untie(%hash); } else { $r->print("Unable to tie hash to db file"); } return OK; } + # --------------------recursive scan of a directory sub scanDir { my ($r,$startdir,$indent)=@_; @@ -139,22 +308,26 @@ sub scanDir { my %dupdirs = %dirs; my @list=&get_list($r,$startdir); foreach my $line (@list) { - my ($strip,$domusr,$foo,$testdir,$foo)=split(/\&/,$line,5); - if ($domusr eq "domain") { + my ($strip,$dom,$foo,$testdir,$foo)=split(/\&/,$line,5); + next if $strip =~ /.*\.meta$/; + if ($dom eq "domain") { $compuri = join('',$strip,"/"); # domain list has /res/ $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; - if (($dirptr&$testdir) or ($domusr =~ /^(domain|user)$/)) { + my $diropen = "closed"; + 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 = "opened"; + delete $dupdirs{key},$dirs{$key}; + } } } - &display_line($r,$diropen,$line,$indent,$curdir); - &scanDir ($r,$compuri,$indent) if $diropen == 1; + &display_line($r,$diropen,$line,$indent,$curdir,@list); + &scanDir ($r,$compuri,$indent) if $diropen eq "opened"; } $indent--; } @@ -164,31 +337,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); + if ($ENV{'form.attrs'} eq "Refresh") { + 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); } @@ -201,7 +363,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>; @@ -218,7 +380,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,55 +389,70 @@ 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"; - my $iconpath="/res/adm/pages/indexericons/"; + my $iconpath= $r->dir_config('lonIconsURL') . "/"; 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 eq "opened"; my $tabtag="		  
\n"); + $r->print ('
'."\n"); + $r->print ($hidden.''."\n"); + $r->print ('print (' name="'.$msg.'" height="22" type="image" border="0">'."\n"); + $r->print("Up $tabtag
"); &begin_form ($r,$filecom[0].'/'); my $anchor = $filecom[0].'/'; $anchor =~ s/\///g; - $r->print ("\nprint (" name=\"View $filecom[0]/ resources\" height=\"22\" type=\"image\" border=\"0\">\n"); + $r->print (''); + $r->print ('print (' name="'.$msg.'" height="22" type="image" border="0">'."\n"); + $r->print ('print (' border="0">'."\n"); $r->print("Domain - $listname $tabtag
\n"); + $r->print("
\n"); my $curdir = $startdir.$filecom[0].'/'; - &begin_form ($r,$curdir); my $anchor = $curdir; $anchor =~ s/\///g; - $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 ("\n"); - $r->print ("$listname $tabtag
"); - while ($count < $indent) { - $r->print("\n"); + $r->print("
"); + my $metafile = grep /^$filecom[0]\.meta\&/, @list; + my $title; + if ($ENV{'form.catalogmode'} eq 'interactive') { + $title=$listname; + $title = &Apache::lonnet::metadata($filelink,'title') + if ($metafile == 1); + $title=$listname unless $title; + $r->print(""); + $r->print("\n"); + $r->print(""); + } + elsif ($ENV{'form.catalogmode'} eq 'groupimport') { + $title=$listname; + $title = &Apache::lonnet::metadata($filelink,'title') + if ($metafile == 1); + $title=$listname unless $title; + $r->print("
\n"); + $r->print("\n"); + $r->print("\n"); + $r->print("
\n"); + $r->print("		"); + $fnum++; + } + + if ($indent > 0 and $indent < 11) { + $r->print("\n"); + } elsif ($indent >0) { + 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 "); - $r->print (" (metadata) ") if (-e $metafile); + $r->print (" (metadata) ") if ($metafile == 1); -# $r->print(" (metadata)") if (-e $metafile); - $r=>print(" ",$filecom[8]," ".(localtime($filecom[9]))." ".(localtime($filecom[10]))." ",$filecom[8]," ".(localtime($filecom[9]))." ".(localtime($filecom[10]))." ".$author." ".$keywords." ".$lang."
"); + $r->print("
"); &begin_form ($r,$curdir); - - my $count = 0; - while ($count < $indent) { - $r->print("\n"); - $count++; + my $indentm1 = $indent-1; + if ($indentm1 < 11 and $indentm1 > 0) { + $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("\n") if $diropen == 0; - $r->print("\n") if $diropen == 1; - $r->print("$listname $tabtag