--- loncom/interface/lonindexer.pm 2002/08/12 18:21:42 1.49 +++ loncom/interface/lonindexer.pm 2003/01/20 16:41:13 1.57 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Directory Indexer # -# $Id: lonindexer.pm,v 1.49 2002/08/12 18:21:42 albertel Exp $ +# $Id: lonindexer.pm,v 1.57 2003/01/20 16:41:13 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -90,6 +90,7 @@ my @Omit = (); sub handler { my $r = shift; $r->content_type('text/html'); + &Apache::loncommon::no_cache($r); $r->send_http_header; return OK if $r->header_only; $fnum=0; @@ -326,9 +327,8 @@ function gothere(val) { - ENDHEADER - +$r->print(&Apache::loncommon::bodytag('Browse Resources')); # - Evaluate actions from previous page (both cumulatively and chronologically) if ($ENV{'form.catalogmode'} eq 'groupimport') { my $acts=$ENV{'form.acts'}; @@ -371,13 +371,9 @@ ENDHEADER } } -# ---------------------------------------------------------------- output title - $r->print( -'

The LearningOnline Network with CAPA '. - 'Network Directory Browser

'."\n"); # ---------------------------------- 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'; @@ -385,7 +381,7 @@ ENDHEADER } } } else { - for (my $i=0; $i<=7; $i++) { + for (my $i=0; $i<=8; $i++) { $attrchk[$i] = 'checked' if $hash{'display_attrs_'.$i} == 1; } } @@ -399,7 +395,7 @@ ENDHEADER Size Last access Last modified - + Show Resource Author Keywords Language @@ -436,6 +432,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_8'} == 1); $r->print(''); # ----------------- read in what directories have previously been set to "open" @@ -518,7 +516,7 @@ sub scanDir { my %dupdirs = %dirs; my @list=&get_list($r,$startdir); foreach my $line (@list) { - my ($strip,$dom,$foo,$testdir,$foo)=split(/\&/,$line,5); + my ($strip,$dom,undef,$testdir,undef)=split(/\&/,$line,5); next if $strip =~ /.*\.meta$/; my (@fileparts) = split(/\./,$strip); if ($hash{'display_attrs_7'} != 1) { @@ -543,7 +541,8 @@ sub scanDir { while (my ($key,$val)= each %dupdirs) { if ($key eq $compuri and $val eq "open") { $diropen = "opened"; - delete $dupdirs{key},$dirs{$key}; + delete($dupdirs{$key}); + delete($dirs{$key}); } } } @@ -629,7 +628,7 @@ sub match_ext { # ------------------------------- displays one line in appropriate table format sub display_line { my ($r,$diropen,$line,$indent,$startdir,$hashref,@list)=@_; - my (@pathfn, $fndir, $fnptr); + my (@pathfn, $fndir); my $dirptr=16384; my $fileclr="#ffffe6"; my $iconpath= $r->dir_config('lonIconsURL') . '/'; @@ -688,7 +687,8 @@ sub display_line { $r->print ('print (' border="0" />'."\n"); - $r->print("Domain - $listname $tabtag\n"); + $r->print("Domain - $listname (". + $Apache::lonnet::domaindescription{$listname}.") $tabtag\n"); return OK; # display user directory @@ -836,6 +836,20 @@ sub display_line { $r->print(' '.($lang eq '' ? ' ' : $lang). " \n"); } + if ($hash{'display_attrs_8'} == 1) { + my $output=''; + my $embstyle=&Apache::loncommon::fileembstyle($curfext); + if ($embstyle eq 'ssi') { + $output=&Apache::lonnet::ssi($filelink); + $output=~s/^.*\]*\>//si; + $output=~s/\<\/body\s*\>.*$//si; + $output=''.$output.''; + } elsif ($embstyle eq 'img') { + $output=''; + } + $r->print(' '.($output eq '' ? ' ':$output). + " \n"); + } $r->print("\n"); } @@ -921,6 +935,15 @@ sub setvalues { 1; +sub cleanup { + if (tied(%hash)){ + &Apache::lonnet::logthis('Cleanup indexer: hash'); + unless (untie(%hash)) { + &Apache::lonnet::logthis('Failed cleanup indexer: hash'); + } + } +} + =head1 NAME Apache::lonindexer - mod_perl module for cross server filesystem browsing