--- loncom/interface/lonindexer.pm 2003/08/06 16:43:36 1.72 +++ loncom/interface/lonindexer.pm 2004/03/29 21:18:00 1.96 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Directory Indexer # -# $Id: lonindexer.pm,v 1.72 2003/08/06 16:43:36 albertel Exp $ +# $Id: lonindexer.pm,v 1.96 2004/03/29 21:18:00 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,13 +46,16 @@ package Apache::lonindexer; use strict; use Apache::lonnet(); use Apache::loncommon(); +use Apache::lonhtmlcommon(); +use Apache::lonsequence(); use Apache::Constants qw(:common); use Apache::lonmeta; use Apache::File; +use Apache::lonlocal; use GDBM_File; # ---------------------------------------- variables used throughout the module -my %hash; # tied to a user-specific gdbm file +my %hash; # global user-specific gdbm file my %dirs; # keys are directories, values are the open/close status my %language; # has the reference information present in language.tab @@ -86,7 +74,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 +105,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=''; @@ -129,7 +117,7 @@ sub handler { %hash = (); { my %dbfile; - if (tie(%dbfile,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) { + if (tie(%dbfile,'GDBM_File',$diropendb,&GDBM_READER(),0640)) { while(my($key,$value)=each(%dbfile)) { $hash{$key}=$value; } @@ -149,8 +137,9 @@ sub handler { ''; $colspan=" colspan='2' "; + my $cl=&mt('Close'); $closebutton=< + END } elsif ($ENV{'form.catalogmode'} eq 'groupimport') { @@ -158,11 +147,13 @@ END ''; $colspan=" colspan='2' "; + my $cl=&mt('Close'); + my $gi=&mt('Group Import'); $closebutton=< + END $groupimportbutton=< END } @@ -174,12 +165,13 @@ END # selection is made. # $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' ); + #&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.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 +182,13 @@ 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.=< ENDHEADER -$r->print(&Apache::loncommon::bodytag('Browse Resources')); +my ($headerdom)=($uri=~/^\/res\/(\w+)\//); +$r->print(&Apache::loncommon::bodytag('Browse Resources',undef,undef,undef, + $headerdom)); # - Evaluate actions from previous page (both cumulatively and chronologically) if ($ENV{'form.catalogmode'} eq 'groupimport') { my $acts=$ENV{'form.acts'}; @@ -352,7 +360,7 @@ $r->print(&Apache::loncommon::bodytag('B $achash{$ref}=$ac; $ac++; } - # sorting through the actions and changing the tied database hash + # sorting through the actions and changing the global database hash foreach (sort {$achash{$a}<=>$achash{$b}} (keys %ahash)) { my $key=$_; if ($ahash{$key} eq '1') { @@ -381,7 +389,7 @@ $r->print(&Apache::loncommon::bodytag('B } # ---------------------------------- get state of file attributes to be showing - if ($ENV{'form.attrs'} ne '') { + if ($ENV{'form.attrs'}) { for (my $i=0; $i<=9; $i++) { delete $hash{'display_attrs_'.$i}; if ($ENV{'form.attr'.$i} == 1) { @@ -394,34 +402,57 @@ $r->print(&Apache::loncommon::bodytag('B $attrchk[$i] = 'checked' if $hash{'display_attrs_'.$i} == 1; } } + # ------------------------------- 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 - +$closebutton $groupimportbutton END - +# ---------------------------------------------------------------- Bread crumbs + $r->print(&Apache::lonhtmlcommon::crumbs($uri,'','', + (($ENV{'form.catalogmode'} eq 'groupimport')? + 'document.forms.fileattr':'')). + &Apache::lonhtmlcommon::select_recent('residx','resrecent', +'this.form.action=this.form.resrecent.options[this.form.resrecent.selectedIndex].value;this.form.submit();'). + ''); +# ------------------------------------------------------ Remember where we were + &Apache::loncommon::storeresurl($uri); + &Apache::lonhtmlcommon::store_recent('residx',$uri,$uri); # ----------------- output starting row to the indexed file/directory hierarchy my $titleclr="#ddffff"; # $r->print(&initdebug()); @@ -429,24 +460,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(''); @@ -475,18 +507,16 @@ END } } - my $bredir = $ENV{'form.dirPointer'}; my $toplevel; my $indent = 0; $uri = $uri.'/' if $uri !~ /.*\/$/; - if ($bredir ne 'on') { - $hash{'top.level'} = $uri; - $toplevel = $uri; - - } else { - $toplevel = $hash{'top.level'}; - } + if ($ENV{'form.dirPointer'} ne 'on') { + $hash{'top.level'} = $uri; + $toplevel = $uri; + } else { + $toplevel = $hash{'top.level'}; + } # -------------------------------- if not at top level, provide an uplink arrow if ($toplevel ne '/res/'){ @@ -511,12 +541,9 @@ END # --------------------------------------------------- end the output and return $r->print(''."\n"); -# } else { -# $r->print('Unable to tie hash to db '. -# 'file'); -# return OK; } if(! $c->aborted()) { +# write back into the temporary file my %dbfile; if (tie(%dbfile,'GDBM_File',$diropendb,&GDBM_NEWDB(),0640)) { while (my($key,$value) = each(%hash)) { @@ -535,34 +562,37 @@ sub scanDir { my $c = $r->connection(); my ($compuri,$curdir); my $dirptr=16384; + my $obs; $indent++; - 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$/; + #This is a kludge, sorry aboot this + my ($strip,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); + next if($strip =~ /.*\.meta$/ | $obs eq '1'); my (@fileparts) = split(/\./,$strip); if ($hash{'display_attrs_9'} != 1) { +# if not all versions to be shown if (scalar(@fileparts) >= 3) { my $fext = pop @fileparts; my $ov = pop @fileparts; my $fname = join ('.',@fileparts,$fext); - next if (grep /\Q$fname\E/,@list and $ov =~ /\d+/); + next if (grep /\Q$fname\E/,@list and $ov =~ /^\d+$/); } } if ($dom eq 'domain') { # dom list has full path /res// already $curdir=''; + $compuri = (split(/\&/,$line))[0]; } else { # user, dir & file have name only, i.e., w/o path $compuri = join('',$startdir,$strip,'/'); $curdir = $startdir; } my $diropen = 'closed'; - if (($dirptr&$testdir) or ($dom =~ /^(domain|user)$/)) { + if (($dirptr&$testdir) or ($dom =~ /^(domain|user)$/) or ($compuri=~/\.(sequence|page)\/$/)) { while (my ($key,$val)= each %dupdirs) { if ($key eq $compuri and $val eq "open") { $diropen = "opened"; @@ -582,18 +612,22 @@ sub get_list { my ($r,$uri)=@_; my @list; (my $luri = $uri) =~ s/\//_/g; - - if ($ENV{'form.attrs'} eq 'Update Display') { + if ($ENV{'form.updatedisplay'}) { foreach (keys %hash) { delete $hash{$_} if ($_ =~ /^dirlist_files_/); - } + } } - if ($hash{'dirlist_files'.$luri}) { + if ($hash{'dirlist_files_'.$luri}) { @list = split(/\n/,$hash{'dirlist_files_'.$luri}); + } elsif ($uri=~/\.(page|sequence)$/) { +# is a page or a sequence + @list= &Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$uri)); + $hash{'dirlist_files_'.$luri} = join("\n",@list); } else { +# is really a directory @list = &Apache::lonnet::dirlist($uri); - $hash{'dirlist_files_'.$luri} = join('\n',@list); + $hash{'dirlist_files_'.$luri} = join("\n",@list); } return @list=&match_ext($r,@list); } @@ -637,7 +671,7 @@ sub match_ext { next if ($unpackline[0] eq '..'); my @filecom = split (/\./,$unpackline[0]); my $fext = pop(@filecom); - my $fnptr = $unpackline[3]&$dirptr; + my $fnptr = ($unpackline[3]&$dirptr) || ($fext=~/\.(page|sequence)$/); if ($fnptr == 0 and $unpackline[3] ne "") { my $embstyle = &Apache::loncommon::fileembstyle($fext); push @trimlist,$line if (defined($embstyle) && @@ -646,7 +680,7 @@ sub match_ext { push @trimlist,$line; } } - @trimlist = sort (@trimlist); + @trimlist = sort {uc($a) cmp uc($b)} (@trimlist); return @trimlist; } @@ -662,12 +696,11 @@ 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; - while ($i<=8) { $tabtag=join('',$tabtag,"") if $hash{'display_attrs_'.$i} == 1; @@ -692,21 +725,20 @@ 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? - - return OK if (!&Apache::lonnet::allowed('bre',$startdir.$filecom[0])); +# Do we have permission to look at this? + if($filecom[15] ne '1') { 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 (''."\n") + if ($ENV{'form.dirPointer'} eq "on"); $r->print("$extrafield"); $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").")
 
"); - &begin_form ($r,$filecom[0].'/'); - my $anchor = $filecom[0].'/'; + &begin_form ($r,$filecom[0]); + my $anchor = $filecom[0]; $anchor =~ s/\///g; $r->print (''); $r->print (''); @@ -715,9 +747,9 @@ sub display_line { $r->print (' name="'.$msg.'" height="22" type="image" border="0">'. "\n"); $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}. ")"); @@ -766,12 +798,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("
"); my $metafile = grep /^\Q$filecom[0]\E\.meta\&/, @list; my $title; @@ -787,11 +814,10 @@ sub display_line { $r->print("". "\n"); $r->print(""); - } - elsif ($ENV{'form.catalogmode'} eq 'groupimport') { + } elsif ($ENV{'form.catalogmode'} eq 'groupimport') { $title=$listname; - $title = &Apache::lonnet::metadata($filelink,'title') - if ($metafile == 1); + #$title = &Apache::lonnet::metadata($filelink,'title') + #if ($metafile == 1); $title=$listname unless $title; my $titleesc=&HTML::Entities::encode($title); $r->print("
\n"); @@ -810,7 +836,15 @@ sub display_line { $hash{"pre_${fnum}_title"}=$titleesc; $fnum++; } - +# Form to open or close sequences + if ($filelink=~/\.(page|sequence)$/) { + my $curdir = $startdir.$filecom[0].'/'; + my $anchor = $curdir; + $anchor =~ s/\///g; + &begin_form($r,$curdir); + $indent--; + } +# General indentation if ($indent > 0 and $indent < 11) { $r->print("\n"); @@ -826,8 +860,23 @@ sub display_line { $r->print("\n") if $rem > 0; } - - $r->print("\n"); +# Sequence open/close icon + if ($filelink=~/\.(page|sequence)$/) { + my $curdir = $startdir.$filecom[0].'/'; + my $anchor = $curdir; + $anchor =~ s/\///g; + $r->print (''); + $r->print ('print (' name="'.$msg.'" height="22" type="image" border="0">'. + "\n"); + } +# Filetype icons + $r->print("\n"); +# Close form to open/close sequence + if ($filelink=~/\.(page|sequence)$/) { + $r->print(''); + } $r->print ("
$listname "); @@ -877,8 +926,20 @@ sub display_line { my $output=''; my $embstyle=&Apache::loncommon::fileembstyle($curfext); if ($embstyle eq 'ssi') { - $output=&Apache::lonnet::ssi_body($filelink); - $output=''.$output.''; + my $cache=$Apache::lonnet::perlvar{'lonDocRoot'}.$filelink. + '.tmp'; + if ((!$ENV{'form.updatedisplay'}) && + (-e $cache)) { + open(FH,$cache); + $output=join("\n",); + close(FH); + } else { + $output=&Apache::lonnet::ssi_body($filelink); + open(FH,">$cache"); + print FH $output; + close(FH); + } + $output=''.$output.''; } elsif ($embstyle eq 'img') { $output=''; } elsif ($filelink=~/^\/res\/(\w+)\/(\w+)\//) { @@ -903,8 +964,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; @@ -934,7 +993,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). + "