--- loncom/interface/lonindexer.pm 2000/08/28 21:07:32 1.1 +++ loncom/interface/lonindexer.pm 2001/06/21 20:57:12 1.11 @@ -5,19 +5,43 @@ # 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 + package Apache::lonindexer; use strict; use Apache::lonnet(); 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'); + map { + $_=~/(\w+)\s+([\w\s\-]+)/; + $language{$1}=$2; + } <$fh>; +} sub handler { my $r = shift; $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'); @@ -26,11 +50,129 @@ 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=''; + 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 Directory Browser +The LearningOnline Network With CAPA Directory Browser + + + ENDHEADER @@ -38,159 +180,159 @@ ENDHEADER my $line; my (@attrchk,@openpath); my $uri=$r->uri; - my $iconpath="/res/adm/pages/indexericons/"; - $r->print("

The LearningOnline 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
+Display file attributes
- - - + + + - - - + + +
SizeLast accessLast modified Size Last access Last modified
AuthorKeywordsLanguage Author Keywords Language
- - - +  + +$hidden +$closebutton +$groupimportbutton
END - my $titleclr="#ddffff"; - my $fileclr="#ffffdd"; + my $titleclr="#ddffff"; $r->print("
\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"); + $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(""); - if ($ENV{'form.openuri'} =~ /$uri\&/) { - my @pathcom = split(/\//,$uri); - pop @pathcom; - my $splituri = join ('/',@pathcom); - $uri = join ('',$splituri,"/"); - } - + map { + if ($_ =~ /^diropen_status_/) { + my $key = $_; + $key =~ s/^diropen_status_//; + $dirs{$key} = $hash{$_}; + } + } keys %hash; - my $openuri = $ENV{'form.openuri'}; -# $r->print ("
openuri=$openuri
"); - $openuri =~ s/$uri(.*)\&//g; -# $r->print ("
parsed openuri=$openuri
"); - @openpath = split(/\&/,$openuri); -# $r->print ("
open path=@openpath
"); - push @openpath, $uri; -# $r->print ("
append current uri to open path=@openpath
"); - @openpath = sort @openpath; -# $r->print ("
sorted open path=@openpath
"); - - - my $indent = -1; - &display_line ($r,1,"/res/".$domain."&domain"); - &branch ($r,"/res/".$domain."/",$indent,@openpath); - - $r->print("
NameSize (bytes) Last accessedLast modifiedNameSize (bytes) Last accessedLast modifiedAuthor(s)KeywordsLanguage
"); - $r->print("
"); - $r->print("\n"); -# &display_env($r); + if ($ENV{'form.openuri'}) { # take care of review and refresh options + my $uri=$ENV{'form.openuri'}; + if (exists($hash{'diropen_status_'.$uri})) { + my $cursta = $hash{'diropen_status_'.$uri}; + $dirs{$uri} = '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'; + } + } +# my $toplevel = "/res/"; + my $toplevel = $uri; + my $indent = 0; + &scanDir ($r,$toplevel,$indent); + + $r->print("
"); + $r->print("
"); + $r->print(""); + $r->print(""); + $r->print("\n"); + untie(%hash); + } else { + $r->print("Unable to tie hash to db file"); + } return OK; } - -# my @packlist=&Apache::lonnet::dirlist($uri); -# print "Dir list
".join('
',@packlist)."
"; - -sub branch { - my ($r,$uri,$indent,@openuri)=@_; - my ($calluri,$line,@list); - my ($domusr,$foo,$strip,$testdir,$compuri,$chkdir,$diropen); + + +# --------------------recursive scan of a directory +sub scanDir { + my ($r,$startdir,$indent)=@_; + my ($compuri,$curdir); my $dirptr=16384; $indent++; - foreach $calluri (@openuri) { - @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; - $testdir = $dirptr; + my %dupdirs = %dirs; + my @list=&get_list($r,$startdir); + foreach my $line (@list) { + 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 + $curdir = $startdir; + } + 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 = "opened"; + delete $dupdirs{key},$dirs{$key}; + } } - $diropen = 0; - $diropen = 1 if ($compuri eq $calluri); - &display_line($r,$diropen,$line,$indent); - - my @securi; - push @securi,$calluri; - &branch($r,$compuri,$indent,@securi) if ($calluri =~ $compuri and $calluri=~/^$uri/ and $chkdir == $dirptr and $testdir ne ""); } + &display_line($r,$diropen,$line,$indent,$curdir,@list); + &scanDir ($r,$compuri,$indent) if $diropen eq "opened"; } $indent--; } -# ------ get complete list based on the uri ------ +# ----------------- get complete matched list based on the uri ------ sub get_list { my ($r,$uri)=@_; my @list; - my $luri=$uri; - $luri=~s/\//_/g; - unlink "/home/httpd/perl/tmp/$ENV{'user.name'}_dirlist*.tmp" if ($ENV{'form.dirlistattr'} eq "Refresh"); - my $dirlist = "/home/httpd/perl/tmp/$ENV{'user.name'}_dirlist$luri.tmp"; - if (-e $dirlist) { - my $FH = Apache::File->new($dirlist); - @list=<$FH>; - } else { - @list=&Apache::lonnet::dirlist($uri); - my $FH = Apache::File->new(">$dirlist"); - print $FH join("\n",@list); + my $luri = $uri; + $luri =~ s/\//_/g; + + if ($ENV{'form.attrs'} eq "Refresh") { + map { + delete $hash{$_} if ($_ =~ /^dirlist_files_/); + } keys %hash; } - return @list=&match_ext($r,@list); -} -# ------ get previously opened path, if any ------ -sub get_openpath { - my $uri=shift; - my @list; - my $openlist = "/home/httpd/perl/tmp/$ENV{'user.name'}_dirlist_open_path.tmp"; - if (-e $openlist) { - my $FH = Apache::File->new($openlist); - @list=<$FH>; - close ($FH); - my $line; - my $FH = Apache::File->new(">$openlist"); - print $FH "$uri\n" if $list[0] eq ""; - foreach $line (@list) { - chomp $line; - if ($line eq $uri) { - my @pathcom = split(/\//,$uri); - pop @pathcom; - my $splituri = join ('/',@pathcom); - $uri = join ('',$splituri,"/"); - } else { - print $FH "$line\n"; - } - } + if ($hash{'dirlist_files'.$luri}) { + @list = split(/\n/,$hash{'dirlist_files_'.$luri}); } else { - my $FH = Apache::File->new(">$openlist"); - print $FH "$uri\n"; + @list = &Apache::lonnet::dirlist($uri); + $hash{'dirlist_files_'.$luri} = join('\n',@list); } - return $uri; + return @list=&match_ext($r,@list); } +#-------------------------- filters out files based on extensions sub match_ext { my ($r,@packlist)=@_; - my $line; my @trimlist; my $nextline; my @fileext; @@ -201,156 +343,198 @@ sub match_ext { if (-e $fn) { my $FH=Apache::File->new($fn); my @content=<$FH>; - foreach $line (@content) { + foreach my $line (@content) { (my $ext,my $foo) = split /\s+/,$line; push @fileext,$ext; } } - foreach $line (@packlist) { - my ($foo,$strip) = split(/\/html/,$line); - my @unpacklist = split (/\&/,$strip); - - my @pathfn = split (/\//,$unpacklist[0]); - my $fndir = $pathfn[scalar(@pathfn)-1]; - my @filecom = split (/\./,$fndir); - my $curfext = $filecom[scalar(@filecom)-1]; - my $fnptr = $unpacklist[3]&$dirptr; - if ($fnptr == 0 and $unpacklist[3] ne "") { - foreach $nextline (@fileext) { - push @trimlist,$strip if $nextline eq $curfext; + foreach my $line (@packlist) { + chomp $line; + $line =~ s/^\/home\/httpd\/html//; + my @unpackline = split (/\&/,$line); + next if ($unpackline[0] eq "."); + next if ($unpackline[0] eq ".."); + my @filecom = split (/\./,$unpackline[0]); + my $fext = pop(@filecom); + my $fnptr = $unpackline[3]&$dirptr; + if ($fnptr == 0 and $unpackline[3] ne "") { + foreach my $nextline (@fileext) { + push @trimlist,$line if $nextline eq $fext; } } else { - push @trimlist,$strip; + push @trimlist,$line; } } + @trimlist = sort (@trimlist); return @trimlist; } +#------------------- displays one line in appropriate table format sub display_line{ - my ($r,$diropen,$line,$indent)=@_; + 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=""; - my $nextline; 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 "domain") { - $r->print(""); + $r->print("$extrafield"); $r->print(""); - &begin_form ($r,$filecom[0]); - $r->print ("print ("comp.blue.gif\""); - $r->print (" name=\"submit\" height=\"22\" type=\"image\" border=\"0\">\n"); + &begin_form ($r,$filecom[0].'/'); + my $anchor = $filecom[0].'/'; + $anchor =~ s/\///g; + $r->print ('print (' name="'.$msg.'" height="22" type="image" border="0">'."\n"); $r->print("Domain - $listname $tabtag\n"); return OK; } - if ($filecom[1] eq "user") { - $r->print(""); + $r->print("$extrafield"); $r->print("\n"); - &begin_form ($r,$filecom[0]); - my $count = 0; - while ($count <= $indent) { - $r->print("\n"); - $count++; - } - $r->print ("print ("folder_pointer_closed.gif\"") if $diropen == 0; - $r->print ("folder_pointer_opened.gif\"") if $diropen == 1; - $r->print (" name=\"submit\" height=\"22\" type=\"image\" border=\"0\">\n"); - $r->print("\n"); - $r->print("$listname $tabtag\n"); + my $curdir = $startdir.$filecom[0].'/'; + &begin_form ($r,$curdir); + my $anchor = $curdir; + $anchor =~ s/\///g; + $r->print (''."\n"); + $r->print ('print (' name="'.$msg.'" height="22" type="image" border="0">'."\n"); + $r->print ("\n"); + $r->print ("$listname $tabtag\n"); return OK; } - # display file if ($fnptr == 0 and $filecom[3] ne "") { my @file_ext = split (/\./,$listname); my $curfext = $file_ext[scalar(@file_ext)-1]; - my $count = 0; - $r->print(""); - while ($count <= $indent) { - $r->print("\n"); + my $filelink = $startdir.$filecom[0]; + $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 < 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," \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; + $r->print(" ",$listname,"\n"); + + $r->print (" (metadata) ") if ($metafile == 1); + + $r->print("\n"); + $r->print(" ",$filecom[8]," \n") + if $hash{'display_attrs_0'} == 1; + $r->print(" ".(localtime($filecom[9]))." \n") + if $hash{'display_attrs_1'} == 1; + $r->print(" ".(localtime($filecom[10]))." \n") + if $hash{'display_attrs_2'} == 1; + + if ($hash{'display_attrs_3'} == 1) { + my $author = &Apache::lonnet::metadata($filelink,'author') if ($metafile == 1); + $author = ' ' if (!$author); + $r->print(" ".$author." \n"); + } + if ($hash{'display_attrs_4'} == 1) { + my $keywords = &Apache::lonnet::metadata($filelink,'keywords') if ($metafile == 1); + $keywords = ' ' if (!$keywords); + $r->print(" ".$keywords." \n"); + } + if ($hash{'display_attrs_5'} == 1) { + my $lang = &Apache::lonnet::metadata($filelink,'language') if ($metafile == 1); + $lang = $language{$lang}; + $lang = ' ' if (!$lang); + $r->print(" ".$lang." \n"); + } $r->print("\n"); } - -# display directory +# -- display directory if ($fnptr == $dirptr) { my @file_ext = split (/\./,$listname); my $curfext = $file_ext[scalar(@file_ext)-1]; - $r->print(""); - &begin_form ($r,$filecom[0]); - - my $count = 0; - while ($count <= $indent) { - $r->print("\n"); + my $curdir = $startdir.$filecom[0].'/'; + my $anchor = $curdir; + $anchor =~ s/\///g; + $r->print("$extrafield"); + &begin_form ($r,$curdir); + 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 ("print ("folder_pointer_closed.gif\"") if $diropen == 0; - $r->print ("folder_pointer_opened.gif\"") if $diropen == 1; - $r->print (" name=\"submit\" height=\"22\" type=\"image\" border=\"0\">\n"); - $r->print("\n") if $diropen == 0; - $r->print("\n") if $diropen == 1; + $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 sub begin_form { my ($r,$uri) = @_; - my $currenturi = $r->uri; - my $openuri = $ENV{'form.openuri'}; - if ($ENV{'form.openuri'} =~ /$currenturi(.*)\&/) { - $openuri =~ s/$currenturi(.*)\&//g; - } else { - $currenturi = join ('',$currenturi,"&"); - $openuri = join ('&',$ENV{'form.openuri'},$currenturi); - $openuri =~ s/\&+/\&/g; - } - $r->print ("
\n"); - $r->print ("\n"); - - for (my $i=0; $i<=5; $i++) { - $r->print ("\n") if $ENV{'form.attr'.$i} == 1; - } -} + my $anchor = $uri; + $anchor =~ s/\///g; + $r->print (''."\n"); + $r->print ("$hidden\n"); -sub display_env { - my $r=shift; - my %otherenv; - $otherenv{'hi'}='there'; - $otherenv{'does_this'}='work?'; - &Apache::lonnet::appenv(%otherenv); - my $envkey; - foreach $envkey (sort keys %ENV) { - $r->print("$envkey: $ENV{$envkey}
\n"); - } -# $r->print("
".&Apache::lonnet::ssi('/res/msu/korte/test.tex')); -# $r->print("
".join('
',&Apache::lonnet::dirlist('/res/msu/korte/'))); } 1; __END__ + + +