--- loncom/interface/lonindexer.pm 2004/03/29 21:18:00 1.96 +++ loncom/interface/lonindexer.pm 2004/05/10 08:34:50 1.103 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Directory Indexer # -# $Id: lonindexer.pm,v 1.96 2004/03/29 21:18:00 www Exp $ +# $Id: lonindexer.pm,v 1.103 2004/05/10 08:34:50 taceyjo1 Exp $ # # Copyright Michigan State University Board of Trustees # @@ -443,16 +443,31 @@ $r->print(&Apache::loncommon::bodytag('B $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();'). - ''); +'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::lonhtmlcommon::store_recent('residx',$uri,$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()); @@ -610,7 +625,7 @@ 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.updatedisplay'}) { foreach (keys %hash) { @@ -620,9 +635,15 @@ sub get_list { if ($hash{'dirlist_files_'.$luri}) { @list = split(/\n/,$hash{'dirlist_files_'.$luri}); - } elsif ($uri=~/\.(page|sequence)$/) { + } elsif ($uri=~/\.(page|sequence)\/$/) { # is a page or a sequence - @list= &Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$uri)); + $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 @@ -688,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') . '/'; @@ -711,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(&mt("Up")." $tabtag
\n"); return OK; } -# Do we have permission to look at this? - if($filecom[15] ne '1') { 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',$pathprefix.$filecom[0])); } + +# make absolute links appear on different background + if ($absolute) { $fileclr='#aaaa88'; } # display domain if ($filecom[1] eq 'domain') { @@ -785,8 +826,8 @@ sub display_line { } # display file - if ($fnptr == 0 and $filecom[3] ne '') { - my $filelink = $startdir.$filecom[0]; + 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) { @@ -801,13 +842,14 @@ sub display_line { my $iconname = &Apache::loncommon::icon($listname); $r->print(""); my $metafile = grep /^\Q$filecom[0]\E\.meta\&/, @list; +# my $metafile=1; 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(""); @@ -816,10 +858,10 @@ sub display_line { $r->print(""); } 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); + $title = &Apache::lonnet::metadata($filelink,'title') + if ($metafile == 1); + $title=$listname unless $title; + my $titleesc=&HTML::Entities::encode($title,'<>&"'); $r->print("
\n"); $r->print("