--- loncom/publisher/lonpubdir.pm 2003/12/29 19:01:27 1.49 +++ loncom/publisher/lonpubdir.pm 2003/12/30 22:19:18 1.50 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Construction Space Directory Lister # -# $Id: lonpubdir.pm,v 1.49 2003/12/29 19:01:27 www Exp $ +# $Id: lonpubdir.pm,v 1.50 2003/12/30 22:19:18 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -37,6 +37,7 @@ use Apache::loncacc; use Apache::loncommon(); use Apache::lonhtmlcommon(); use Apache::lonlocal; +use Apache::lonmsg; sub handler { @@ -85,11 +86,11 @@ sub handler { my $targetdir=$udom.'/'.$uname.$thisdisfn; # Publiction target directory. my $linkdir='/priv/'.$uname.$thisdisfn; # Full URL name of constr space. - + my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom); &startpage($r, $uname, $udom, $thisdisfn); # Put out the start of page. - # Start off the diretory table. + # Start off the directory table. $r->print(''. ''. ''. ''. - ''. + ''. ''. ''. "\n"); @@ -282,7 +287,7 @@ sub putdirectory { sub putresource { my ($r, $uname, $filename, $thisdisfn, $resdir, $targetdir, $linkdir, - $cmtime) = @_; + $cmtime,$bombs) = @_; my $status=&mt('Unpublished'); my $bgcolor='#FFCCCC'; @@ -301,11 +306,13 @@ sub putresource { } $title=''. + ($$bombs{$targetdir.'/'.$filename}?'':''). getTitleString($targetdir.'/'.$filename, 'title').''; } else { $status=&mt('Modified'); $bgcolor='#FFFFCC'; $title=''. + ($$bombs{$targetdir.'/'.$filename}?'':''). getTitleString($targetdir.'/'.$filename,'title').''; if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') { $status.='
'.&mt('Actions').''.&mt('Name').''. @@ -111,10 +112,10 @@ sub handler { my $extension=''; if ($filename=~/\.(\w+)$/) { $extension=$1; } if ($cmode&$dirptr) { - putdirectory($r, $thisdisfn, $linkdir, $filename, $cmtime); + putdirectory($r, $thisdisfn, $linkdir, $filename, $cmtime,$targetdir,\%bombs); } elsif (&Apache::loncommon::fileembstyle($extension) ne 'hdn') { putresource($r, $uname, $filename, $thisdisfn, $resdir, - $targetdir, $linkdir, $cmtime); + $targetdir, $linkdir, $cmtime,\%bombs); } else { # "hidden" extension and not a directory, so hide it away. } @@ -222,7 +223,7 @@ ENDPUBDIRSCRIPT ''); } $r->print( - &Apache::lonhtmlcommon::crumbs($thisdisfn.'/','_top','/priv/'.$uname)); + &Apache::lonhtmlcommon::crumbs($uname.'/'.$thisdisfn.'/','_top','/priv')); } # @@ -255,7 +256,7 @@ sub getTitleString { # modtime - Encoded modification time. # sub putdirectory { - my ($r, $reqfile, $here, $dirname, $modtime) = @_; + my ($r, $reqfile, $here, $dirname, $modtime, $resdir, $bombs) = @_; # construct the display filename: the directory name unless ..: @@ -265,11 +266,15 @@ sub putdirectory { } unless (( ($dirname eq '..') && ($reqfile eq '')) || ($dirname eq '.')) { + my $kaputt=0; + foreach (keys %{$bombs}) { + if ($_=~/^$resdir\/$disfilename\//) { $kaputt=1; last; } + } $r->print('
'.&mt('Go to ...').''. $disfilename.' '.($kaputt?'':' ').' '.&Apache::lonlocal::locallocaltime($modtime).'