--- loncom/interface/lonindexer.pm 2003/08/21 21:57:36 1.75 +++ loncom/interface/lonindexer.pm 2004/01/05 15:02:43 1.86 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Directory Indexer # -# $Id: lonindexer.pm,v 1.75 2003/08/21 21:57:36 albertel Exp $ +# $Id: lonindexer.pm,v 1.86 2004/01/05 15:02:43 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,21 +25,6 @@ # # http://www.lon-capa.org/ # -# 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 -# 6/26,7/8 H. K. Ng -# 8/14 H. K. Ng -# 11/30 Matthew Hall -# YEAR=2002 -# 6/29/2002 H. K. Ng -# ### ############################################################################### @@ -61,9 +46,11 @@ package Apache::lonindexer; use strict; use Apache::lonnet(); use Apache::loncommon(); +use Apache::lonhtmlcommon(); use Apache::Constants qw(:common); use Apache::lonmeta; use Apache::File; +use Apache::lonlocal; use GDBM_File; # ---------------------------------------- variables used throughout the module @@ -86,7 +73,7 @@ my @Omit = (); sub handler { my $r = shift; my $c = $r->connection(); - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); &Apache::loncommon::no_cache($r); $r->send_http_header; return OK if $r->header_only; @@ -117,7 +104,7 @@ sub handler { # Get the parameters from the query string &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['catalogmode','launch','acts','mode','form','element', - 'only','omit']); + 'only','omit','titleelement']); #------------------------------------------------------------------- my $closebutton=''; my $groupimportbutton=''; @@ -149,8 +136,9 @@ sub handler { ''; $colspan=" colspan='2' "; + my $cl=&mt('Close'); $closebutton=< + END } elsif ($ENV{'form.catalogmode'} eq 'groupimport') { @@ -158,11 +146,13 @@ END ''; $colspan=" colspan='2' "; + my $cl=&mt('Close'); + my $gi=&mt('Group Import'); $closebutton=< + END $groupimportbutton=< END } @@ -175,11 +165,12 @@ END # $element is the name of the element in $formname which receives # the URL. # &Apache::lonxml::debug('Checking mode, form, element'); - &setvalues(\%hash,'form.mode' ,\%ENV,'form.mode' ); - &setvalues(\%hash,'form.form' ,\%ENV,'form.form' ); - &setvalues(\%hash,'form.element',\%ENV,'form.element'); - &setvalues(\%hash,'form.only' ,\%ENV,'form.only' ); - &setvalues(\%hash,'form.omit' ,\%ENV,'form.omit' ); + &setvalues(\%hash,'form.mode' ,\%ENV,'form.mode' ); + &setvalues(\%hash,'form.form' ,\%ENV,'form.form' ); + &setvalues(\%hash,'form.element' ,\%ENV,'form.element'); + &setvalues(\%hash,'form.titleelement',\%ENV,'form.titleelement'); + &setvalues(\%hash,'form.only' ,\%ENV,'form.only' ); + &setvalues(\%hash,'form.omit' ,\%ENV,'form.omit' ); # Deal with 'omit' and 'only' if (exists $ENV{'form.omit'}) { @@ -190,12 +181,14 @@ END } my $mode = $ENV{'form.mode'}; - my ($form,$element); + my ($form,$element,$titleelement); if ($mode eq 'edit' || $mode eq 'parmset') { - $form = $ENV{'form.form'}; - $element = $ENV{'form.element'}; + $form = $ENV{'form.form'}; + $element = $ENV{'form.element'}; + $titleelement = $ENV{'form.titleelement'}; } - &Apache::lonxml::debug("mode=$mode form=$form element=$element"); + &Apache::lonxml::debug("mode=$mode form=$form element=$element + titleelement=$titleelement"); # ------ set catalogmodefunctions to have extra needed javascript functionality my $catalogmodefunctions=''; if ($ENV{'form.catalogmode'} eq 'interactive' or @@ -244,6 +237,7 @@ END // mode = $mode function select_data(title,url) { changeURL(url); + changeTitle(title); self.close(); } @@ -258,8 +252,20 @@ function changeURL(val) { alert("The file you selected is: "+val); } } - END + if (!$titleelement) { + $catalogmodefunctions.='function changeTitle(val) {}'; + } else { + $catalogmodefunctions.=<print(&Apache::loncommon::bodytag('B # ------------------------------- output state of file attributes to be showing # All versions has to the last item # since it does not take an extra col + my %lt=&Apache::lonlocal::texthash( + 'ti' => 'Title', + 'si' => 'Size', + 'la' => 'Last access', + 'lm' => 'Last modified', + 'st' => 'Statistics', + 'au' => 'Author', + 'kw' => 'Keywords', + 'ln' => 'Language', + 'sr' => 'Show resource', + 'av' => 'All versions', + 'ud' => 'Update Display' + ); + my $Displayfileattributes=&mt('Display file attributes'); $r->print(< -Display file attributes
+$Displayfileattributes
- - - - - - - - - - + + + + + + + + + + +
Title Size Last access Last modified Statistics
Author Keywords Language Show Resource All versions $lt{'ti'} $lt{'si'} $lt{'la'} $lt{'lm'} $lt{'st'}
$lt{'au'} $lt{'kw'} $lt{'ln'} $lt{'sr'} $lt{'av'}  
- + $closebutton $groupimportbutton END - +# ---------------------------------------------------------------- Bread crumbs + $r->print(&Apache::lonhtmlcommon::crumbs($uri)); +# ------------------------------------------------------ Remember where we were + &Apache::loncommon::storeresurl($uri); # ----------------- output starting row to the indexed file/directory hierarchy my $titleclr="#ddffff"; # $r->print(&initdebug()); @@ -431,24 +455,25 @@ END # $r->print(&writedebug("Only:@Only")) if (@Only); $r->print("
\n"); $r->print("\n"); - $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") + $r->print("\n") if ($hash{'display_attrs_2'} == 1); - $r->print("\n") + $r->print("\n") if ($hash{'display_attrs_3'} == 1); - $r->print("\n") + $r->print("\n") if ($hash{'display_attrs_4'} == 1); - $r->print("\n") + $r->print("\n") if ($hash{'display_attrs_5'} == 1); - $r->print("\n") + $r->print("\n") if ($hash{'display_attrs_6'} == 1); - $r->print("\n") + $r->print("\n") if ($hash{'display_attrs_7'} == 1); - $r->print("\n") + $r->print("\n") if ($hash{'display_attrs_8'} == 1); $r->print(''); @@ -586,7 +611,7 @@ sub get_list { my @list; (my $luri = $uri) =~ s/\//_/g; - if ($ENV{'form.attrs'} eq 'Update Display') { + if ($ENV{'form.attrs'} eq &mt('Update Display')) { foreach (keys %hash) { delete $hash{$_} if ($_ =~ /^dirlist_files_/); } @@ -649,7 +674,7 @@ sub match_ext { push @trimlist,$line; } } - @trimlist = sort (@trimlist); + @trimlist = sort {uc($a) cmp uc($b)} (@trimlist); return @trimlist; } @@ -665,8 +690,8 @@ sub display_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 $msg = &mt('View').' '.$filecom[0].' '.&mt('resources'); + $msg = &mt('Close').' '.$filecom[0].' '.&mt('directory') if $diropen eq 'opened'; my $tabtag=''; my $i=0; @@ -695,7 +720,7 @@ sub display_line { $r->print ('print (' name="'.$msg.'" height="22" type="image" border="0">'. "\n"); - $r->print("Up $tabtag\n"); + $r->print(&mt("Up")." $tabtag\n"); return OK; } # Do we have permission to look at this? @@ -720,7 +745,7 @@ sub display_line { $r->print ('print (' border="0" />'."\n"); - $r->print ("Domain - $listname "); + $r->print (&mt("Domain")." - $listname "); if ($Apache::lonnet::domaindescription{$listname}) { $r->print("(".$Apache::lonnet::domaindescription{$listname}. ")"); @@ -758,6 +783,7 @@ sub display_line { # display file if ($fnptr == 0 and $filecom[3] ne '') { my $filelink = $startdir.$filecom[0]; + next if &Apache::lonnet::metadata($filelink,'obsolete'); my @file_ext = split (/\./,$listname); my $curfext = $file_ext[-1]; if (@Omit) { @@ -769,12 +795,7 @@ sub display_line { return OK if ($skip > 0); } # Set the icon for the file - my $iconname = "unknown.gif"; - my $embstyle = &Apache::loncommon::fileembstyle($curfext); - # The unless conditional that follows is a bit of overkill - $iconname = $curfext.".gif" unless - (!defined($embstyle) || $embstyle eq 'unk' || $embstyle eq 'hdn'); - # + my $iconname = &Apache::loncommon::icon($listname); $r->print("\n"); + $r->print ("$listname\n"); +# Attributes + my $filelink = $startdir.$filecom[0].'/default'; + + if ($hash{'display_attrs_0'} == 1) { + my $title = &Apache::lonnet::gettitle($filelink,'title'); + $r->print(''."\n"); + } + $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; + + if ($hash{'display_attrs_4'} == 1) { + my $author = &Apache::lonnet::metadata($filelink,'author'); + $r->print('\n"); + } + if ($hash{'display_attrs_5'} == 1) { + my $keywords = &Apache::lonnet::metadata($filelink,'keywords'); + # $keywords = ' ' if (!$keywords); + $r->print('\n"); + } + if ($hash{'display_attrs_6'} == 1) { + my $lang = &Apache::lonnet::metadata($filelink,'language'); + $lang = &Apache::loncommon::languagedescription($lang); + $r->print('\n"); + } + if ($hash{'display_attrs_7'} == 1) { + $r->print(''); + } + if ($hash{'display_attrs_8'} == 1) { + $r->print(''); + } + $r->print(''); } }
NameTitle".&mt('Name')."".&mt('Title')."Size (bytes) ". + $r->print("".&mt("Size")." (".&mt("bytes").") ". "Last accessed".&mt("Last accessed")."Last modified".&mt("Last modified")."Author(s)".&mt("Author(s)")."Keywords".&mt("Keywords")."Language".&mt("Language")."Resource".&mt("Resource")."Usage Statistics
(Courses/Network Hits)		".&mt("Usage Statistics")."
(". + &mt("Courses/Network Hits").")
"); my $metafile = grep /^\Q$filecom[0]\E\.meta\&/, @list; my $title; @@ -830,7 +851,7 @@ sub display_line { ".gif border='0' />\n") if $rem > 0; } - $r->print("\n"); + $r->print("\n"); $r->print (" $listname "); @@ -906,8 +927,6 @@ sub display_line { # -- display directory if ($fnptr == $dirptr) { - my @file_ext = split (/\./,$listname); - my $curfext = $file_ext[scalar(@file_ext)-1]; my $curdir = $startdir.$filecom[0].'/'; my $anchor = $curdir; $anchor =~ s/\///g; @@ -937,7 +956,49 @@ sub display_line { $r->print (''. "\n"); - $r->print ("$listname$tabtag
'.($title eq '' ? ' ' : $title). + ' ', + $filecom[8]," '. + (localtime($filecom[9]))." '. + (localtime($filecom[10]))." '.($author eq '' ? ' ' : $author). + " '.($keywords eq '' ? ' ' : $keywords). + " '.($lang eq '' ? ' ' : $lang). + "