--- loncom/interface/lonindexer.pm 2002/12/02 17:53:24 1.53 +++ loncom/interface/lonindexer.pm 2003/06/16 22:09:02 1.68 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Directory Indexer # -# $Id: lonindexer.pm,v 1.53 2002/12/02 17:53:24 albertel Exp $ +# $Id: lonindexer.pm,v 1.68 2003/06/16 22:09:02 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -34,15 +34,10 @@ # 05/9-05/19/2001 H. K. Ng # 05/21/2001 H. K. Ng # 05/23/2001 H. K. Ng -# 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 -# 8/28,10/15,11/28,11/29 Scott Harrison # 11/30 Matthew Hall -# 12/11,12/13 Scott Harrison # YEAR=2002 -# 1/17 Scott Harrison # 6/29/2002 H. K. Ng # ### @@ -89,13 +84,13 @@ my @Omit = (); # ----------------------------- Handling routine called via Apache and mod_perl sub handler { my $r = shift; + my $c = $r->connection(); $r->content_type('text/html'); &Apache::loncommon::no_cache($r); $r->send_http_header; return OK if $r->header_only; $fnum=0; $dnum=0; - untie %hash; # Deal with stupid global variables (is there a way around making # these global to this package? It is just so wrong....) @@ -129,9 +124,18 @@ sub handler { $extrafield=''; my $diropendb = - "/home/httpd/perl/tmp/$domain\_$ENV{'user.name'}_indexer.db"; - - if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) { + "/home/httpd/perl/tmp/$ENV{'user.domain'}_$ENV{'user.name'}_indexer.db"; + %hash = (); + { + my %dbfile; + if (tie(%dbfile,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) { + while(my($key,$value)=each(%dbfile)) { + $hash{$key}=$value; + } + untie(%dbfile); + } + } + { if ($ENV{'form.launch'} eq '1') { &start_fresh_session(); } @@ -373,7 +377,7 @@ $r->print(&Apache::loncommon::bodytag('B # ---------------------------------- get state of file attributes to be showing if ($ENV{'form.attrs'} ne '') { - for (my $i=0; $i<=7; $i++) { + for (my $i=0; $i<=8; $i++) { delete $hash{'display_attrs_'.$i}; if ($ENV{'form.attr'.$i} == 1) { $attrchk[$i] = 'checked'; @@ -381,7 +385,7 @@ $r->print(&Apache::loncommon::bodytag('B } } } else { - for (my $i=0; $i<=7; $i++) { + for (my $i=0; $i<=8; $i++) { $attrchk[$i] = 'checked' if $hash{'display_attrs_'.$i} == 1; } } @@ -395,11 +399,12 @@ $r->print(&Apache::loncommon::bodytag('B Size Last access Last modified - + All versions Author Keywords Language - All versions + Show Resource +  @@ -432,6 +437,8 @@ END if ($hash{'display_attrs_5'} == 1); $r->print("Language\n") if ($hash{'display_attrs_6'} == 1); + $r->print("Resource\n") + if ($hash{'display_attrs_7'} == 1); $r->print(''); # ----------------- read in what directories have previously been set to "open" @@ -495,18 +502,28 @@ END # --------------------------------------------------- end the output and return $r->print(''."\n"); - untie(%hash); - } else { - $r->print('Unable to tie hash to db '. - 'file'); - return OK; +# } else { +# $r->print('Unable to tie hash to db '. +# 'file'); +# return OK; + } + if(! $c->aborted()) { + my %dbfile; + if (tie(%dbfile,'GDBM_File',$diropendb,&GDBM_NEWDB(),0640)) { + while (my($key,$value) = each(%hash)) { + $dbfile{$key}=$value; + } + untie(%dbfile); + } } + return OK; } # ----------------------------------------------- recursive scan of a directory sub scanDir { my ($r,$startdir,$indent,$hashref)=@_; + my $c = $r->connection(); my ($compuri,$curdir); my $dirptr=16384; $indent++; @@ -514,15 +531,16 @@ sub scanDir { my %dupdirs = %dirs; my @list=&get_list($r,$startdir); foreach my $line (@list) { + return if ($c->aborted()); my ($strip,$dom,undef,$testdir,undef)=split(/\&/,$line,5); next if $strip =~ /.*\.meta$/; my (@fileparts) = split(/\./,$strip); - if ($hash{'display_attrs_7'} != 1) { + if ($hash{'display_attrs_8'} != 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+/); + next if (grep /\Q$fname\E/,@list and $ov =~ /\d+/); } } @@ -641,16 +659,18 @@ sub display_line { my $tabtag=''; my $i=0; - while ($i<=6) { + while ($i<=7) { $tabtag=join('',$tabtag," ") if $hash{'display_attrs_'.$i} == 1; $i++; } + + my $valign = ($hash{'display_attrs_7'} == 1 ? 'top' : 'bottom'); # display uplink arrow if ($filecom[1] eq 'viewOneUp') { $r->print("$extrafield"); - $r->print("\n"); + $r->print("\n"); $r->print ('
\n"); return OK; } +# Do we have permission to look at this? + + return OK if (!&Apache::lonnet::allowed('bre',$startdir.$filecom[0])); # display domain if ($filecom[1] eq 'domain') { $r->print (''."\n") if ($ENV{'form.dirPointer'} eq "on"); $r->print("$extrafield"); - $r->print(""); + $r->print(""); &begin_form ($r,$filecom[0].'/'); my $anchor = $filecom[0].'/'; $anchor =~ s/\///g; @@ -685,15 +708,19 @@ sub display_line { $r->print ('print (' border="0" />'."\n"); - $r->print("Domain - $listname (". - $Apache::lonnet::domaindescription{$listname}.") $tabtag\n"); + $r->print ("Domain - $listname "); + if ($Apache::lonnet::domaindescription{$listname}) { + $r->print("(".$Apache::lonnet::domaindescription{$listname}. + ")"); + } + $r->print (" $tabtag\n"); return OK; # display user directory } if ($filecom[1] eq 'user') { $r->print("$extrafield"); - $r->print("\n"); + $r->print("\n"); my $curdir = $startdir.$filecom[0].'/'; my $anchor = $curdir; $anchor =~ s/\///g; @@ -708,14 +735,17 @@ sub display_line { $r->print (''); - $r->print ($listname.$tabtag.''."\n"); + my $domain=(split(m|/|,$startdir))[2]; + my $plainname=&Apache::loncommon::plainname($listname,$domain); + $r->print ($listname); + if (defined($plainname) && $plainname) { $r->print(" ($plainname) "); } + $r->print ($tabtag.''."\n"); return OK; } # display file if ($fnptr == 0 and $filecom[3] ne '') { my $filelink = $startdir.$filecom[0]; - return OK if (!&Apache::lonnet::allowed('bre',$filelink)); my @file_ext = split (/\./,$listname); my $curfext = $file_ext[-1]; if (@Omit) { @@ -733,8 +763,8 @@ sub display_line { $iconname = $curfext.".gif" unless (!defined($embstyle) || $embstyle eq 'unk' || $embstyle eq 'hdn'); # - $r->print(""); - my $metafile = grep /^$filecom[0]\.meta\&/, @list; + $r->print(""); + my $metafile = grep /^\Q$filecom[0]\E\.meta\&/, @list; my $title; if ($ENV{'form.catalogmode'} eq 'interactive') { $title=$listname; @@ -747,7 +777,7 @@ sub display_line { $titleesc,"','",$filelink,"')\">"); $r->print("". "\n"); - $r->print(""); + $r->print(""); } elsif ($ENV{'form.catalogmode'} eq 'groupimport') { $title=$listname; @@ -766,7 +796,7 @@ sub display_line { $r->print("\n"); $r->print("\n"); - $r->print(""); + $r->print(""); $hash{"pre_${fnum}_link"}=$filelink; $hash{"pre_${fnum}_title"}=$titleesc; $fnum++; @@ -801,39 +831,55 @@ sub display_line { if ($hash{'display_attrs_0'} == 1) { my $title = &Apache::lonnet::metadata($filelink,'title') if ($metafile == 1); - $r->print(' '.($title eq '' ? ' ' : $title). + $r->print(' '.($title eq '' ? ' ' : $title). ' '."\n"); } - $r->print(' ', + $r->print(' ', $filecom[8]," \n") if $hash{'display_attrs_1'} == 1; - $r->print(' '. + $r->print(' '. (localtime($filecom[9]))." \n") if $hash{'display_attrs_2'} == 1; - $r->print(' '. + $r->print(' '. (localtime($filecom[10]))." \n") if $hash{'display_attrs_3'} == 1; if ($hash{'display_attrs_4'} == 1) { my $author = &Apache::lonnet::metadata($filelink,'author') if ($metafile == 1); - $r->print(' '.($author eq '' ? ' ' : $author). + $r->print(' '.($author eq '' ? ' ' : $author). " \n"); } if ($hash{'display_attrs_5'} == 1) { my $keywords = &Apache::lonnet::metadata($filelink,'keywords') if ($metafile == 1); # $keywords = ' ' if (!$keywords); - $r->print(' '.($keywords eq '' ? ' ' : $keywords). + $r->print(' '.($keywords eq '' ? ' ' : $keywords). " \n"); } if ($hash{'display_attrs_6'} == 1) { my $lang = &Apache::lonnet::metadata($filelink,'language') if ($metafile == 1); $lang = &Apache::loncommon::languagedescription($lang); - $r->print(' '.($lang eq '' ? ' ' : $lang). + $r->print(' '.($lang eq '' ? ' ' : $lang). " \n"); } + if ($hash{'display_attrs_7'} == 1) { + my $output=''; + my $embstyle=&Apache::loncommon::fileembstyle($curfext); + if ($embstyle eq 'ssi') { + $output=&Apache::lonnet::ssi_body($filelink); + $output=''.$output.''; + } elsif ($embstyle eq 'img') { + $output=''; + } elsif ($filelink=~/^\/res\/(\w+)\/(\w+)\//) { + $output=''; + } + $r->print(' '.($output eq '' ? ' ':$output). + " \n"); + } $r->print("\n"); } @@ -844,7 +890,7 @@ sub display_line { my $curdir = $startdir.$filecom[0].'/'; my $anchor = $curdir; $anchor =~ s/\///g; - $r->print("$extrafield"); + $r->print("$extrafield"); &begin_form ($r,$curdir); my $indentm1 = $indent-1; if ($indentm1 < 11 and $indentm1 > 0) { @@ -919,6 +965,12 @@ sub setvalues { 1; +sub cleanup { + if (tied(%hash)){ + &Apache::lonnet::logthis('Cleanup indexer: hash'); + } +} + =head1 NAME Apache::lonindexer - mod_perl module for cross server filesystem browsing