--- loncom/interface/lonindexer.pm 2003/09/26 00:23:09 1.77 +++ loncom/interface/lonindexer.pm 2004/01/02 21:00:56 1.85 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Directory Indexer # -# $Id: lonindexer.pm,v 1.77 2003/09/26 00:23:09 www Exp $ +# $Id: lonindexer.pm,v 1.85 2004/01/02 21:00:56 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,6 +46,7 @@ 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; @@ -118,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=''; @@ -179,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'}) { @@ -194,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 @@ -248,6 +237,7 @@ END // mode = $mode function select_data(title,url) { changeURL(url); + changeTitle(title); self.close(); } @@ -262,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 'st' => 'Statistics', 'au' => 'Author', 'kw' => 'Keywords', - 'la' => 'Language', + 'ln' => 'Language', 'sr' => 'Show resource', 'av' => 'All versions', 'ud' => 'Update Display' ); + my $Displayfileattributes=&mt('Display file attributes'); $r->print(< -Display file attributes
+$Displayfileattributes
@@ -429,7 +432,7 @@ $r->print(&Apache::loncommon::bodytag('B - + @@ -441,7 +444,10 @@ $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()); @@ -668,7 +674,7 @@ sub match_ext { push @trimlist,$line; } } - @trimlist = sort (@trimlist); + @trimlist = sort {uc($a) cmp uc($b)} (@trimlist); return @trimlist; } @@ -789,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("
$lt{'ti'} $lt{'si'}
$lt{'au'} $lt{'kw'} $lt{'la'} $lt{'ln'} $lt{'sr'} $lt{'av'}  
"); my $metafile = grep /^\Q$filecom[0]\E\.meta\&/, @list; my $title; @@ -850,7 +851,7 @@ sub display_line { ".gif border='0' />\n") if $rem > 0; } - $r->print("\n"); + $r->print("\n"); $r->print (" $listname "); @@ -926,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;