--- loncom/interface/lonindexer.pm 2015/01/23 22:59:28 1.213.4.8 +++ loncom/interface/lonindexer.pm 2016/06/19 04:27:50 1.225 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Directory Indexer # -# $Id: lonindexer.pm,v 1.213.4.8 2015/01/23 22:59:28 raeburn Exp $ +# $Id: lonindexer.pm,v 1.225 2016/06/19 04:27:50 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -709,7 +709,20 @@ sub scanDir { return if ($c->aborted()); #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'); + next if (($strip =~ /\.meta$/) || ($obs)); + if ($dom ne 'domain') { + my ($udom,$uname); + if ($dom eq 'user') { + ($udom) = ($startdir =~ m{^/res/($match_domain)}); + $uname = $strip; + } else { + ($udom,$uname) = ($startdir =~ m{^/res/($match_domain)/($match_courseid)}); + } + if ($udom ne '' && $uname ne '') { + # Don't display "course author" directory. + next if (&Apache::lonnet::is_course($udom,$uname)); + } + } my (@fileparts) = split(/\./,$strip); if ($hash{'display_attrs_9'} != 1) { # if not all versions to be shown @@ -1351,8 +1364,8 @@ sub coursecontext { $r->print( &mt('Already in this course:').'
' .&mt('[_1] in folder/map [_2]', - &Apache::lonnet::gettitle($resource), - &Apache::lonnet::gettitle($map)) + &Apache::lonnet::gettitle($resource), + &Apache::lonnet::gettitle($map)) .'
'); } }