--- loncom/interface/lonindexer.pm 2003/08/06 16:43:36 1.72 +++ loncom/interface/lonindexer.pm 2003/08/21 21:57:36 1.75 @@ -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.75 2003/08/21 21:57:36 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -337,7 +337,9 @@ function gothere(val) { 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'}; @@ -549,13 +551,14 @@ sub scanDir { 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,'/'); @@ -705,8 +708,8 @@ sub display_line { if ($ENV{'form.dirPointer'} eq "on"); $r->print("$extrafield"); $r->print(""); - &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,7 +718,7 @@ sub display_line { $r->print (' name="'.$msg.'" height="22" type="image" border="0">'. "\n"); $r->print ('print (' border="0" />'."\n"); $r->print ("Domain - $listname "); if ($Apache::lonnet::domaindescription{$listname}) {