[BACK]Return to lonpubdir.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / publisher

Diff for /loncom/publisher/lonpubdir.pm between versions 1.54 and 1.58

version 1.54, 2004/01/03 15:57:11 version 1.58, 2004/01/15 20:22:47
Line 245  sub getTitleString { Line 245  sub getTitleString {
     return $title;      return $title;
 }  }
   
   sub getCopyRightString {
       my $fullname = shift;
       return &Apache::lonnet::metadata($fullname, 'copyright');
   }
 #  #
 #  Put out a directory table row:  #  Put out a directory table row:
 #    putdirectory(r, base, here, dirname, modtime)  #    putdirectory(r, base, here, dirname, modtime)
Line 268  sub putdirectory { Line 271  sub putdirectory {
     ($dirname eq '.')) {      ($dirname eq '.')) {
  my $kaputt=0;   my $kaputt=0;
  foreach (keys %{$bombs}) {   foreach (keys %{$bombs}) {
     if ($_=~/^$resdir\/$disfilename\//) { $kaputt=1; last; }      if ($_=~m:^\Q$resdir\E/\Q$disfilename\E/:) { $kaputt=1; last; }
  }   }
  %Apache::lonpublisher::metadatafields=();   %Apache::lonpublisher::metadatafields=();
  %Apache::lonpublisher::metadatakeys=();   %Apache::lonpublisher::metadatakeys=();
  my $construct=$here;   my $construct=$here;
  $construct=~s/^\/priv\/(\w+)$/\/home\/$1\/public_html/;   $construct=~s:^/priv/(\w+)$:/home/$1/public_html:;
  &Apache::lonpublisher::metaeval(&Apache::lonnet::getfile(   &Apache::lonpublisher::metaeval(&Apache::lonnet::getfile(
         $construct.'/'.$dirname.'/default.meta'          $construct.'/'.$dirname.'/default.meta'
  ));   ));
Line 281  sub putdirectory { Line 284  sub putdirectory {
   '<td><img src="'.    '<td><img src="'.
   $Apache::lonnet::perlvar{'lonIconsURL'}.'/folder_closed.gif" /></td>'.    $Apache::lonnet::perlvar{'lonIconsURL'}.'/folder_closed.gif" /></td>'.
   '<td>'.&mt('Go to ...').'</td>'.    '<td>'.&mt('Go to ...').'</td>'.
   '<td><font size="+1" face="arial"><a href="'.$here.'/'.$dirname.'/" target="_top">'.    '<td><font face="arial"><a href="'.$here.'/'.$dirname.'/" target="_top">'.
   $disfilename.'</a></font></td>'.    $disfilename.'</a></font></td>'.
         '<td colspan="2">'.($kaputt?'<img src="/adm/lonMisc/bomb.gif" />':'').$Apache::lonpublisher::metadatafields{'title'}.' <i>'.          '<td colspan="2">'.($kaputt?&Apache::lonhtmlcommon::authorbombs($resdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'}.' <i>'.
   $Apache::lonpublisher::metadatafields{'subject'}.'</i> '.    $Apache::lonpublisher::metadatafields{'subject'}.'</i> '.
   $Apache::lonpublisher::metadatafields{'keywords'}.'</td>'.    $Apache::lonpublisher::metadatafields{'keywords'}.'</td>'.
   '<td>'.&Apache::lonlocal::locallocaltime($modtime).'</td>'.    '<td>'.&Apache::lonlocal::locallocaltime($modtime).'</td>'.
Line 308  sub putresource { Line 311  sub putresource {
     $ratime,$rmtime,$rctime,      $ratime,$rmtime,$rctime,
     $rblksize,$rblocks)=stat($resdir.'/'.$filename);      $rblksize,$rblocks)=stat($resdir.'/'.$filename);
  if ($rmtime>=$cmtime) {   if ($rmtime>=$cmtime) {
     $status=&mt('Published');      $status=&mt('Published').'<br />'.
    &mt(&getCopyRightString($targetdir.'/'.$filename));
             $bgcolor='#CCFF88';              $bgcolor='#CCFF88';
     if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {      if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {
  $status=&mt('Obsolete');   $status=&mt('Obsolete');
Line 316  sub putresource { Line 320  sub putresource {
     }      }
     $title='<a href="/res/'.$targetdir.'/'.$filename.      $title='<a href="/res/'.$targetdir.'/'.$filename.
  '.meta" target=cat>'.   '.meta" target=cat>'.
  getTitleString($targetdir.'/'.$filename, 'title').'</a>';   &getTitleString($targetdir.'/'.$filename).'</a>';
  } else {   } else {
     $status=&mt('Modified');      $status=&mt('Modified').'<br />'.
    &mt(&getCopyRightString($targetdir.'/'.$filename));
             $bgcolor='#FFFF77';              $bgcolor='#FFFF77';
     $title='<a href="/res/'.$targetdir.'/'.$filename.'.meta" target=cat>'.      $title='<a href="/res/'.$targetdir.'/'.$filename.'.meta" target=cat>'.
  getTitleString($targetdir.'/'.$filename,'title').'</a>';   &getTitleString($targetdir.'/'.$filename).'</a>';
     if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {      if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {
  $status.='<br><a href="/adm/diff?filename=/~'.$uname.   $status.='<br /><a href="/adm/diff?filename=/~'.$uname.
     $thisdisfn.'/'.$filename.      $thisdisfn.'/'.$filename.
     '&versiontwo=priv" target=cat>'.&mt('Diffs').'</a>';      '&versiontwo=priv" target=cat>'.&mt('Diffs').'</a>';
     }      }
Line 352  sub putresource { Line 357  sub putresource {
       '<td><a target="_parent" href="/adm/publish?filename=/~'.        '<td><a target="_parent" href="/adm/publish?filename=/~'.
       $uname.$thisdisfn.'/'.$filename.'">'.&mt('Publish').'</a>'.        $uname.$thisdisfn.'/'.$filename.'">'.&mt('Publish').'</a>'.
       '</td>'.        '</td>'.
       '<td><font size="+1" face="arial">'.        '<td><font face="arial">'.
       '<a href="'.$linkdir.'/'.$filename.'" target="_top">'.        '<a href="'.$linkdir.'/'.$filename.'" target="_top">'.
                $filename.'</a></font>'.$editlink2.$editlink.                 $filename.'</a></font>'.$editlink2.$editlink.
       '</td>'.        '</td>'.
Removed from v.1.54  
changed lines
  Added in v.1.58

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>