--- loncom/interface/lonindexer.pm 2004/01/05 15:02:43 1.86 +++ loncom/interface/lonindexer.pm 2004/05/11 05:19:30 1.104 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Directory Indexer # -# $Id: lonindexer.pm,v 1.86 2004/01/05 15:02:43 www Exp $ +# $Id: lonindexer.pm,v 1.104 2004/05/11 05:19:30 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -47,6 +47,7 @@ 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; @@ -54,7 +55,7 @@ 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 @@ -116,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; } @@ -164,7 +165,7 @@ END # selection is made. # $element is the name of the element in $formname which receives # the URL. - # &Apache::lonxml::debug('Checking mode, form, element'); + #&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'); @@ -187,8 +188,7 @@ END $element = $ENV{'form.element'}; $titleelement = $ENV{'form.titleelement'}; } - &Apache::lonxml::debug("mode=$mode form=$form element=$element - titleelement=$titleelement"); + #&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 @@ -360,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') { @@ -389,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) { @@ -402,6 +402,7 @@ $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 @@ -424,30 +425,49 @@ $r->print(&Apache::loncommon::bodytag('B enctype="application/x-www-form-urlencoded"> $Displayfileattributes
- - - - - + + + + + - - - - - + + + + +
$lt{'ti'} $lt{'si'} $lt{'la'} $lt{'lm'} $lt{'st'} $lt{'ti'} $lt{'si'} $lt{'la'} $lt{'lm'} $lt{'st'}
$lt{'au'} $lt{'kw'} $lt{'ln'} $lt{'sr'} $lt{'av'} $lt{'au'} $lt{'kw'} $lt{'ln'} $lt{'sr'} $lt{'av'}  
- + + - -$closebutton -$groupimportbutton - +$closebutton $groupimportbutton END +# -------------- Filter out sequence containment in crumbs and "recent folders" + my $storeuri=$uri; + $storeuri='/'.(split(/\.(page|sequence)\/\//,$uri))[-1]; + $storeuri=~s/\/+/\//g; # ---------------------------------------------------------------- Bread crumbs - $r->print(&Apache::lonhtmlcommon::crumbs($uri)); + $r->print(&Apache::lonhtmlcommon::crumbs($storeuri,'','', + (($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();')); +# -------------------------------------------------------- Resource Home Button + my $reshome=$ENV{'course.'.$ENV{'request.course.id'}.'.reshome'}; + if ($reshome) { + $r->print("print('javascript:document.forms.fileattr.action="'.$reshome.'";document.forms.fileattr.submit();'); + } else { + $r->print($reshome); + } + $r->print("'>".&mt('Home').''); + } + $r->print(''); # ------------------------------------------------------ Remember where we were - &Apache::loncommon::storeresurl($uri); + &Apache::loncommon::storeresurl($storeuri); + &Apache::lonhtmlcommon::store_recent('residx',$storeuri,$storeuri); # ----------------- output starting row to the indexed file/directory hierarchy my $titleclr="#ddffff"; # $r->print(&initdebug()); @@ -502,18 +522,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/'){ @@ -538,12 +556,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)) { @@ -562,16 +577,18 @@ 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; @@ -590,7 +607,7 @@ sub scanDir { $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"; @@ -608,20 +625,30 @@ sub scanDir { # --------------- get complete matched list based on the uri (returns an array) sub get_list { my ($r,$uri)=@_; - my @list; + my @list=(); (my $luri = $uri) =~ s/\//_/g; - - if ($ENV{'form.attrs'} eq &mt('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 + $uri=~s/\/$//; + $uri='/'.(split(/\.(page|sequence)\/\//,$uri))[-1]; + $uri=~s/\/+/\//g; + foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$uri))) { + my @ratpart=split(/\:/,$_); + push @list,$ratpart[1]; + } + $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); } @@ -665,7 +692,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) && @@ -682,6 +709,17 @@ sub match_ext { sub display_line { my ($r,$diropen,$line,$indent,$startdir,$hashref,@list)=@_; my (@pathfn, $fndir); +# there could be relative paths (files actually belonging into this directory) +# or absolute paths (for example, from sequences) + my $absolute; + my $pathprefix; + if ($line=~/^\/res\//) { + $absolute=1; + $pathprefix=''; + } else { + $absolute=0; + $pathprefix=$startdir; + } my $dirptr=16384; my $fileclr="#ffffe6"; my $iconpath= $r->dir_config('lonIconsURL') . '/'; @@ -695,7 +733,6 @@ sub display_line { my $tabtag=''; my $i=0; - while ($i<=8) { $tabtag=join('',$tabtag," ") if $hash{'display_attrs_'.$i} == 1; @@ -706,9 +743,14 @@ sub display_line { # display uplink arrow if ($filecom[1] eq 'viewOneUp') { + my $updir=$startdir; +# -------------- Filter out sequence containment in crumbs and "recent folders" + $updir='/'.(split(/\.(page|sequence)\/\//,$startdir))[-1]; + $updir=~s/\/+/\//g; + $r->print("$extrafield"); $r->print("\n"); - $r->print ('
print (''."\n") - if ($ENV{'form.dirPointer'} eq "on"); + $r->print (''."\n") + if ($ENV{'form.dirPointer'} eq "on"); $r->print("$extrafield"); $r->print(""); &begin_form ($r,$filecom[0]); @@ -781,9 +826,8 @@ sub display_line { } # display file - if ($fnptr == 0 and $filecom[3] ne '') { - my $filelink = $startdir.$filecom[0]; - next if &Apache::lonnet::metadata($filelink,'obsolete'); + if (($fnptr == 0 and $filecom[3] ne '') or $absolute) { + my $filelink = $pathprefix.$filecom[0]; my @file_ext = split (/\./,$listname); my $curfext = $file_ext[-1]; if (@Omit) { @@ -797,27 +841,33 @@ sub display_line { # Set the icon for the file my $iconname = &Apache::loncommon::icon($listname); $r->print(""); - my $metafile = grep /^\Q$filecom[0]\E\.meta\&/, @list; + + my $metafile = $Apache::lonnet::perlvar{'lonDocRoot'}.$pathprefix. + $filecom[0].'.meta'; + if (-e $metafile) { + $metafile=1; + } else { + $metafile=0; + } my $title; if ($ENV{'form.catalogmode'} eq 'interactive') { $title=$listname; $title = &Apache::lonnet::metadata($filelink,'title') if ($metafile == 1); $title=$listname unless $title; - my $titleesc=HTML::Entities::encode($title); + my $titleesc=HTML::Entities::encode($title,'<>&"'); $titleesc=~s/\'/\\'/; #' (clean up this spare quote) $r->print(""); $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=$listname unless $title; - my $titleesc=&HTML::Entities::encode($title); + my $titleesc=&HTML::Entities::encode($title,'<>&"'); $r->print("\n"); $r->print(" 0 and $indent < 11) { $r->print("\n"); @@ -850,20 +908,33 @@ sub display_line { $r->print("\n") if $rem > 0; } - +# 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 "); $r->print (" (metadata) ") if ($metafile == 1); - + "TARGET=_self>metadata) "); $r->print("\n"); if ($hash{'display_attrs_0'} == 1) { - my $title = &Apache::lonnet::gettitle($filelink,'title') - if ($metafile == 1); + my $title = &Apache::lonnet::gettitle($filelink,'title'); $r->print(' '.($title eq '' ? ' ' : $title). ' '."\n"); } @@ -878,21 +949,18 @@ sub display_line { if $hash{'display_attrs_3'} == 1; if ($hash{'display_attrs_4'} == 1) { - my $author = &Apache::lonnet::metadata($filelink,'author') - if ($metafile == 1); + my $author = &Apache::lonnet::metadata($filelink,'author'); $r->print(' '.($author eq '' ? ' ' : $author). " \n"); } if ($hash{'display_attrs_5'} == 1) { - my $keywords = &Apache::lonnet::metadata($filelink,'keywords') - if ($metafile == 1); + my $keywords = &Apache::lonnet::metadata($filelink,'keywords'); # $keywords = ' ' if (!$keywords); $r->print(' '.($keywords eq '' ? ' ' : $keywords). " \n"); } if ($hash{'display_attrs_6'} == 1) { - my $lang = &Apache::lonnet::metadata($filelink,'language') - if ($metafile == 1); + my $lang = &Apache::lonnet::metadata($filelink,'language'); $lang = &Apache::loncommon::languagedescription($lang); $r->print(' '.($lang eq '' ? ' ' : $lang). " \n"); @@ -901,8 +969,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+)\//) { @@ -914,7 +994,7 @@ sub display_line { " \n"); } if ($hash{'display_attrs_8'} == 1) { - my (%stat) = &Apache::lonmeta::dynamicmeta($filelink) if ($metafile == 1); + my (%stat) = &Apache::lonmeta::dynamicmeta($filelink); my $stat = (exists($stat{'course'}) ? $stat{'course'} : ''). ((exists($stat{'course'}) || exists($stat{'count'})) ? '/' : ''). (exists($stat{'count'}) ? $stat{'count'} : '');