--- loncom/publisher/lonpubdir.pm	2003/12/30 22:19:18	1.50
+++ loncom/publisher/lonpubdir.pm	2004/01/03 03:19:43	1.52
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construction Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.50 2003/12/30 22:19:18 www Exp $
+# $Id: lonpubdir.pm,v 1.52 2004/01/03 03:19:43 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -270,12 +270,20 @@ sub putdirectory {
 	foreach (keys %{$bombs}) {
 	    if ($_=~/^$resdir\/$disfilename\//) { $kaputt=1; last; }
 	}
+	%Apache::lonpublisher::metadatafields=();
+	%Apache::lonpublisher::metadatakeys=();
+	my $construct=$here;
+	$construct=~s/^\/priv\/(\w+)$/\/home\/$1\/public_html/;
+	&Apache::lonpublisher::metaeval(&Apache::lonnet::getfile(
+       				 $construct.'/'.$dirname.'/default.meta'
+								 ));
 	$r->print('<tr bgcolor="#CCCCFF">'.
 		  '<td>'.&mt('Go to ...').'</td>'.
 		  '<td><a href="'.$here.'/'.$dirname.'/" target="_top">'.
 		  $disfilename.'</a></td>'.
-		        '<td>'.($kaputt?'<img src="/adm/lonMisc/bomb.gif" />':'&nbsp;').'</td>'.
-		  '<td>&nbsp;</td>'.
+		        '<td colspan="2">'.($kaputt?'<img src="/adm/lonMisc/bomb.gif" />':'').$Apache::lonpublisher::metadatafields{'title'}.' '.
+		  $Apache::lonpublisher::metadatafields{'subject'}.' '.
+		  $Apache::lonpublisher::metadatafields{'keywords'}.'</td>'.
 		  '<td>'.&Apache::lonlocal::locallocaltime($modtime).'</td>'.
 		  "</tr>\n");
     }	
@@ -306,20 +314,20 @@ sub putresource {
 	    }
 	    $title='<a href="/res/'.$targetdir.'/'.$filename.
 		'.meta" target=cat>'.
-		($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" />':'').
 		getTitleString($targetdir.'/'.$filename, 'title').'</a>';
 	} else {
 	    $status=&mt('Modified');
             $bgcolor='#FFFFCC';
 	    $title='<a href="/res/'.$targetdir.'/'.$filename.'.meta" target=cat>'.
-		($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" />':'').
 		getTitleString($targetdir.'/'.$filename,'title').'</a>';
 	    if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {
 		$status.='<br><a href="/adm/diff?filename=/~'.$uname.
 		    $thisdisfn.'/'.$filename.
 		    '&versiontwo=priv" target=cat>'.&mt('Diffs').'</a>';
 	    }
-	}   
+	}
+	$title.='<br /><a href="/~'.$uname.$thisdisfn.'/'.$filename.'.meta">'. 
+	    ($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" />':'Edit Metadata').'</a>';
 	$status.='<br><a href="/adm/retrieve?filename=/~'.$uname.
 	    $thisdisfn.'/'.$filename.'" target=cat>'.&mt('Retrieve').'</a>';
     }