--- loncom/interface/lonindexer.pm 2001/08/08 03:00:11 1.16 +++ loncom/interface/lonindexer.pm 2001/08/14 14:13:03 1.18 @@ -1,22 +1,20 @@ # 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) +# YEAR=1999 +# 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 +# YEAR=2000 # 07/20-08/04 H.K. Ng -# +# YEAR=2001 # 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 -# 8/6,8/7 Scott Harrison +# 5/31,6/1,6/2,6/15 Scott Harrison +# 6/26,7/8 H. K. Ng +# 8/6,8/7,8/10 Scott Harrison +# 8/14 H. K. Ng package Apache::lonindexer; @@ -26,13 +24,17 @@ use Apache::Constants qw(:common); use Apache::File; use GDBM_File; -my %hash; -my %dirs; -my %language; -my $hidden; -my $extrafield; -my $fnum; -my $dnum; +my %hash; # tied to a user-specific gdbm file +my %dirs; # keys are directories, values are the open/close status +my %language; # has the reference information present in language.tab + +# ----- Values which are set by the handler subroutine and are accessible to +# ----- other methods. +my $extrafield; # default extra table cell +my $fnum; # file counter +my $dnum; # directory counter + +# ---------------------------------------------------------------------- BEGIN sub BEGIN { my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}. '/language.tab'); @@ -42,6 +44,7 @@ sub BEGIN { } <$fh>; } +# ---------------------------------------------------------------- Main Handler sub handler { my $r = shift; $r->content_type('text/html'); @@ -49,6 +52,8 @@ sub handler { return OK if $r->header_only; $fnum=0; $dnum=0; + +# --------------------------------------------- machine configuration variables my $iconpath= $r->dir_config('lonIconsURL') . "/"; my $domain = $r->dir_config('lonDefDomain'); my $role = $r->dir_config('lonRole'); @@ -64,44 +69,22 @@ sub handler { my $uri=$r->uri; # -------------------------------------- see if called from an interactive mode -# foreach my $key (sort(keys(%ENV))) { -# $r->print("$key is $ENV{$key}
"); -# } -# $r->print("END ENV"); - 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; - } - if ($name eq 'launch') { - $ENV{'form.'.$name}=$value; - } - if ($name eq 'acts') { - $ENV{'form.'.$name}=$value; - } - } (split(/&/,$ENV{'QUERY_STRING'})); + &get_unprocessed_cgi(); - $hidden=''; my $closebutton=''; + my $closebutton=''; my $groupimportbutton=''; my $colspan=''; $extrafield=''; - my $diropendb = "/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',$diropendb,&GDBM_WRCREAT,0640)) { if ($ENV{'form.launch'} eq '1') { - delete $hash{'mode_catalog'}; - map { - if ($_ =~ /^pre_/) { - delete $hash{$_}; - } - if ($_ =~ /^store/) { - delete $hash{$_}; - } - } keys %hash; + &start_fresh_session(); } + +# -------------------- refresh environment with user database values (in %hash) if ($hash{'mode_catalog'} eq 'interactive') { $ENV{'form.catalogmode'}='interactive'; } @@ -109,15 +92,13 @@ sub handler { $ENV{'form.catalogmode'}='groupimport'; } +# --------------------- define extra fields and buttons in case of special mode if ($ENV{'form.catalogmode'} eq 'interactive') { $hash{'mode_catalog'}='interactive'; $extrafield=''. ''; + ' border="0" />'; $colspan=" colspan='2' "; - $hidden=< -END $closebutton=< END @@ -126,19 +107,18 @@ END $hash{'mode_catalog'}='groupimport'; $extrafield=''. ''; + ' border="0" />'; $colspan=" colspan='2' "; - $hidden=< -END $closebutton=< END $groupimportbutton=< + END } +# ------ set catalogmodefunctions to have extra needed javascript functionality my $catalogmodefunctions=''; if ($ENV{'form.catalogmode'} eq 'interactive' or $ENV{'form.catalogmode'} eq 'groupimport') { @@ -148,53 +128,9 @@ function select_data(title,url) { changeURL(url); self.close(); } -function save_group() { - for (var num=0; numprint(< @@ -258,27 +187,25 @@ function gothere(val) { ENDHEADER + +# - Evaluate actions from previous page (both cumulatively and chronologically) if ($ENV{'form.catalogmode'} eq 'groupimport') { -# $r->print($ENV{'form.acts'}."
"); my $acts=$ENV{'form.acts'}; my @Acts=split(/b/,$acts); my %ahash; my %achash; my $ac=0; + # some initial hashes for working with data map { my ($state,$ref)=split(/a/); $ahash{$ref}=$state; $achash{$ref}=$ac; $ac++; } (@Acts); + # sorting through the actions and changing the tied database hash map { my $key=$_; if ($ahash{$key} eq '1') { -# $r->print("NEW: "); -# $r->print($hash{'pre_'.$key.'_title'}); -# $r->print(" : "); -# $r->print($hash{'pre_'.$key.'_link'}); -# $r->print("
"); $hash{'store_'.$hash{'pre_'.$key.'_link'}}= $hash{'pre_'.$key.'_title'}; $hash{'storectr_'.$hash{'pre_'.$key.'_link'}}= @@ -291,46 +218,24 @@ ENDHEADER } } } sort {$achash{$a}<=>$achash{$b}} (keys %ahash); - map { - if ($_ =~ /^store_/) { - my $key=$_; - $key=~s/^store_//; -# $r->print("STORE: "); -# $r->print($hash{'storectr_'.$key}); -# $r->print(':'); -# $r->print($hash{'store_'.$key}); -# $r->print(':'); -# $r->print($key); -# $r->print("
"); - } - } keys %hash; + # deleting the previously cached listing map { if ($_ =~ /^pre_/ && $_ =~/link$/) { my $key = $_; $key =~ s/^pre_//; $key =~ s/_[^_]*$//; -# $r->print($key); -# $r->print(':'); -# $r->print($hash{'pre_'.$key.'_title'}); -# $r->print(':'); -# $r->print($hash{'pre_'.$key.'_link'}); -# $r->print('
'); delete $hash{'pre_'.$key.'_title'}; delete $hash{'pre_'.$key.'_link'}; } } keys %hash; } - $r->print('

The LearningOnline With CAPA Network Directory Browser

'."\n"); - } else { - $r->print('Unable to tie hash to db file'); - return OK; - } - untie %hash; - if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT,0640)) { - +# output title + $r->print('

The LearningOnline With CAPA '. + 'Network Directory Browser

'."\n"); +# get state of file attributes to be showing if ($ENV{'form.attrs'} ne "") { - for (my $i=0; $i<=5; $i++) { + for (my $i=0; $i<=6; $i++) { delete $hash{'display_attrs_'.$i}; if ($ENV{'form.attr'.$i} == 1) { $attrchk[$i] = "checked"; @@ -338,44 +243,55 @@ ENDHEADER } } } else { - for (my $i=0; $i<=5; $i++) { + for (my $i=0; $i<=6; $i++) { $attrchk[$i] = "checked" if $hash{'display_attrs_'.$i} == 1; } } +# output state of file attributes to be showing $r->print(<Display file attributes
-
+Display file attributes
+ + +
Size Last access Last modified All versions
Author Keywords Language 
  -$hidden $closebutton $groupimportbutton
END + # output starting row to the indexed file/directory hierarchy my $titleclr="#ddffff"; $r->print("
\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("\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(""); + # read in what directories have previously been set to "open" map { if ($_ =~ /^diropen_status_/) { my $key = $_; @@ -404,6 +320,7 @@ END my $toplevel; my $indent = 0; $uri = $uri.'/' if $uri !~ /.*\/$/; + if ($bredir ne "on") { $hash{'top.level'} = $uri; $toplevel = $uri; @@ -411,6 +328,8 @@ END } else { $toplevel = $hash{'top.level'}; } + + # if not at top level, provide an uplink arrow if ($toplevel ne "/res/"){ my (@uri_com) = split(/\//,$uri); pop @uri_com; @@ -419,22 +338,31 @@ END &display_line ($r,'opened',$upone.'&viewOneUp',0,$upone,@list); $indent = 1; } + + # recursively go through all the directories and output as appropriate &scanDir ($r,$toplevel,$indent,\%hash); + # information useful for group import $r->print(""); $r->print(""); + + # end the tables $r->print("
NameSize (bytes) Last accessedLast modifiedAuthor(s)KeywordsLanguageSize (bytes) ". + "Last accessedLast modifiedAuthor(s)KeywordsLanguage
"); $r->print("
"); + + # end the output and return $r->print("\n"); untie(%hash); } else { - $r->print("Unable to tie hash to db file"); + $r->print('Unable to tie hash to db '. + 'file'); + return OK; } return OK; } -# --------------------recursive scan of a directory +# ----------------------------------------------- recursive scan of a directory sub scanDir { my ($r,$startdir,$indent,$hashref)=@_; my ($compuri,$curdir); @@ -446,11 +374,22 @@ sub scanDir { foreach my $line (@list) { my ($strip,$dom,$foo,$testdir,$foo)=split(/\&/,$line,5); next if $strip =~ /.*\.meta$/; + my (@fileparts) = split(/\./,$strip); + if ($hash{'display_attrs_6'} != 1) { + if (scalar(@fileparts) >= 3) { + my $fext = pop @fileparts; + my $ov = pop @fileparts; + my $fname = join ('.',@fileparts,$fext); + next if (grep /$fname/,@list and $ov =~ /\d+/); + } + } + if ($dom eq "domain") { - $compuri = join('',$strip,"/"); # domain list has /res/ + $compuri = join('',$strip,"/"); # dom list has /res/ $curdir = $compuri; } else { - $compuri = join('',$startdir,$strip,"/"); # user, dir & file have name only, i.e., w/o path + # user, dir & file have name only, i.e., w/o path + $compuri = join('',$startdir,$strip,"/"); $curdir = $startdir; } my $diropen = "closed"; @@ -468,7 +407,7 @@ sub scanDir { $indent--; } -# ----------------- get complete matched list based on the uri ------ +# --------------- get complete matched list based on the uri (returns an array) sub get_list { my ($r,$uri)=@_; my @list; @@ -490,7 +429,7 @@ sub get_list { return @list=&match_ext($r,@list); } -#-------------------------- filters out files based on extensions +# -------------------- filters out files based on extensions (returns an array) sub match_ext { my ($r,@packlist)=@_; my @trimlist; @@ -529,7 +468,7 @@ sub match_ext { return @trimlist; } -#------------------- displays one line in appropriate table format +# ------------------------------- displays one line in appropriate table format sub display_line{ my ($r,$diropen,$line,$indent,$startdir,$hashref,@list)=@_; my (@pathfn, $fndir, $fnptr); @@ -548,26 +487,35 @@ sub display_line{ my $i=0; while ($i<=5) { - $tabtag=join('',$tabtag," ") if $hash{'display_attrs_'.$i} == 1; + $tabtag=join('',$tabtag," ") + if $hash{'display_attrs_'.$i} == 1; $i++; } + +# display uplink arrow if ($filecom[1] eq "viewOneUp") { $r->print("$extrafield"); $r->print("\n"); $r->print ('
'."\n"); - $r->print ($hidden.''."\n"); + $r->print (''."\n"); $r->print (''."\n"); $r->print ('print (' name="'.$msg.'" height="22" type="image" border="0">'."\n"); + $r->print (' name="'.$msg.'" height="22" type="image" border="0">'. + "\n"); $r->print("Up $tabtag
\n"); return OK; } + +# display domain if ($filecom[1] eq "domain") { - $r->print (''."\n") if ($ENV{'form.dirPointer'} eq "on"); + $r->print (''."\n") + if ($ENV{'form.dirPointer'} eq "on"); $r->print("$extrafield"); $r->print(""); &begin_form ($r,$filecom[0].'/'); @@ -575,12 +523,17 @@ sub display_line{ $anchor =~ s/\///g; $r->print (''); $r->print (''); - $r->print ('print (' name="'.$msg.'" height="22" type="image" border="0">'."\n"); - $r->print ('print (' border="0">'."\n"); + $r->print ('print (' name="'.$msg.'" height="22" type="image" border="0">'. + "\n"); + $r->print ('print (' border="0" />'."\n"); $r->print("Domain - $listname $tabtag\n"); return OK; + +# display user directory } if ($filecom[1] eq "user") { $r->print("$extrafield"); @@ -589,14 +542,20 @@ sub display_line{ my $anchor = $curdir; $anchor =~ s/\///g; &begin_form ($r,$curdir); - $r->print (''."\n"); + $r->print (''."\n"); $r->print (''); - $r->print ('print (' name="'.$msg.'" height="22" type="image" border="0">'."\n"); - $r->print (''); + $r->print ('print (' name="'.$msg.'" height="22" type="image" border="0">'. + "\n"); + $r->print (''); $r->print ($listname.$tabtag.''."\n"); return OK; } + # display file if ($fnptr == 0 and $filecom[3] ne "") { my @file_ext = split (/\./,$listname); @@ -612,7 +571,8 @@ sub display_line{ $title=$listname unless $title; $r->print(""); - $r->print("\n"); + $r->print("". + "\n"); $r->print(""); } elsif ($ENV{'form.catalogmode'} eq 'groupimport') { @@ -638,49 +598,66 @@ sub display_line{ } if ($indent > 0 and $indent < 11) { - $r->print("\n"); + $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"); + $r->print("\n"); $count++; } - $r->print("\n") if $rem > 0; + $r->print("\n") if $rem > 0; } - $r->print("\n"); - $r->print (" $listname "); - - $r->print (" (metadata) ") if ($metafile == 1); + $r->print("\n"); + $r->print (" $listname "); + + $r->print (" (metadata) ") if ($metafile == 1); $r->print("\n"); - $r->print(" ",$filecom[8]," \n") + $r->print(" ", + $filecom[8]," \n") if $hash{'display_attrs_0'} == 1; - $r->print(" ".(localtime($filecom[9]))." \n") + $r->print(" ". + (localtime($filecom[9]))." \n") if $hash{'display_attrs_1'} == 1; - $r->print(" ".(localtime($filecom[10]))." \n") + $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); + my $author = &Apache::lonnet::metadata($filelink,'author') + if ($metafile == 1); $author = ' ' if (!$author); - $r->print(" ".$author." \n"); + $r->print(" ".$author. + " \n"); } if ($hash{'display_attrs_4'} == 1) { - my $keywords = &Apache::lonnet::metadata($filelink,'keywords') if ($metafile == 1); + my $keywords = &Apache::lonnet::metadata($filelink,'keywords') + if ($metafile == 1); $keywords = ' ' if (!$keywords); - $r->print(" ".$keywords." \n"); + $r->print(" ".$keywords. + " \n"); } if ($hash{'display_attrs_5'} == 1) { - my $lang = &Apache::lonnet::metadata($filelink,'language') if ($metafile == 1); + my $lang = &Apache::lonnet::metadata($filelink,'language') + if ($metafile == 1); $lang = $language{$lang}; $lang = ' ' if (!$lang); - $r->print(" ".$lang." \n"); + $r->print(" ".$lang. + " \n"); } $r->print("\n"); } + # -- display directory if ($fnptr == $dirptr) { my @file_ext = split (/\./,$listname); @@ -692,21 +669,28 @@ sub display_line{ &begin_form ($r,$curdir); my $indentm1 = $indent-1; if ($indentm1 < 11 and $indentm1 > 0) { - $r->print("\n"); + $r->print("\n"); } else { my $ten = int($indentm1/10.); my $rem = $indentm1%10.0; my $count = 0; while ($count < $ten) { - $r->print ("\n"); + $r->print ("\n"); $count++; } - $r->print ("\n") if $rem > 0; + $r->print ("\n") if $rem > 0; } $r->print (''); - $r->print ('print (' name="'.$msg.'" height="22" type="image" border="0">'."\n"); - $r->print (''."\n"); + $r->print ('print (' name="'.$msg.'" height="22" type="image" border="0">'. + "\n"); + $r->print (''. + "\n"); $r->print ("$listname$tabtag\n"); } @@ -717,13 +701,41 @@ sub begin_form { my ($r,$uri) = @_; my $anchor = $uri; $anchor =~ s/\///g; - $r->print ('
print (''."\n"); - $r->print ($hidden.''."\n"); - $r->print (''."\n"); + $r->print (''. + "\n"); + $r->print (''."\n"); $dnum++; } +# ----------- grab unprocessed CGI variables that may have been appended to URL +sub get_unprocessed_cgi { + 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' or $name eq 'launch' or $name eq 'acts') { + $ENV{'form.'.$name}=$value; + } + } (split(/&/,$ENV{'QUERY_STRING'})); +} + +# --------- settings whenever the user causes the indexer window to be launched +sub start_fresh_session { + delete $hash{'mode_catalog'}; + map { + if ($_ =~ /^pre_/) { + delete $hash{$_}; + } + if ($_ =~ /^store/) { + delete $hash{$_}; + } + } keys %hash; +} + 1; __END__