--- loncom/interface/lonindexer.pm 2003/01/09 22:04:28 1.54 +++ 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.54 2003/01/09 22:04:28 www Exp $ +# $Id: lonindexer.pm,v 1.57 2003/01/20 16:41:13 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -373,7 +373,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 +381,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,7 +395,7 @@ $r->print(&Apache::loncommon::bodytag('B Size Last access Last modified - + Show Resource Author Keywords Language @@ -432,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" @@ -834,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"); } @@ -920,7 +936,12 @@ sub setvalues { 1; sub cleanup { - untie(%hash) if (tied(%hash)); + if (tied(%hash)){ + &Apache::lonnet::logthis('Cleanup indexer: hash'); + unless (untie(%hash)) { + &Apache::lonnet::logthis('Failed cleanup indexer: hash'); + } + } } =head1 NAME