--- loncom/interface/lonmeta.pm	2006/08/04 19:42:55	1.162
+++ loncom/interface/lonmeta.pm	2006/08/04 22:16:38	1.164
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.162 2006/08/04 19:42:55 albertel Exp $
+# $Id: lonmeta.pm,v 1.164 2006/08/04 22:16:38 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -170,7 +170,7 @@ sub authordisplay {
     my ($aname,$adom)=@_;
     return &Apache::loncommon::aboutmewrapper
         (&Apache::loncommon::plainname($aname,$adom),
-         $aname,$adom,'preview').' <tt>['.$aname.'@'.$adom.']</tt>';
+         $aname,$adom,'preview').' <tt>['.$aname.':'.$adom.']</tt>';
 }
 
 # Pretty display
@@ -841,30 +841,38 @@ sub present_uneditable_metadata {
     if (! defined($title)) {
         $title = 'Untitled Resource';
     }
-    foreach ('title', 
-             'author', 
-             'subject', 
-             'keywords', 
-             'notes', 
-             'abstract',
-             'lowestgradelevel',
-             'highestgradelevel',
-             'standards', 
-             'mime', 
-             'language', 
-             'creationdate', 
-             'lastrevisiondate', 
-             'owner', 
-             'copyright', 
-             'customdistributionfile',
-             'sourceavail',
-             'sourcerights', 
-             'obsolete', 
-             'obsoletereplacement') {
-        $table.='<tr><td bgcolor="#AAAAAA">'.$lt{$_}.
+    my @fields;
+    if ($uploaded) {
+	@fields = ('title','author','subject','keywords','notes','abstract',
+		   'lowestgradelevel','highestgradelevel','standards','mime',
+		   'owner');
+    } else {
+	@fields = ('title', 
+		   'author', 
+		   'subject', 
+		   'keywords', 
+		   'notes', 
+		   'abstract',
+		   'lowestgradelevel',
+		   'highestgradelevel',
+		   'standards', 
+		   'mime', 
+		   'language', 
+		   'creationdate', 
+		   'lastrevisiondate', 
+		   'owner', 
+		   'copyright', 
+		   'customdistributionfile',
+		   'sourceavail',
+		   'sourcerights', 
+		   'obsolete', 
+		   'obsoletereplacement');
+    }
+    foreach my $field (@fields) {
+        $table.='<tr><td bgcolor="#AAAAAA">'.$lt{$field}.
             '</td><td bgcolor="#CCCCCC">'.
-            &prettyprint($_,$content{$_}).'</td></tr>';
-        delete $content{$_};
+            &prettyprint($field,$content{$field}).'</td></tr>';
+        delete($content{$field});
     }
     #
     $r->print(<<ENDHEAD);
@@ -1163,7 +1171,8 @@ ENDEDIT
 	my $output;
 	my @fields;
 	if ($file_type eq 'portfolio') {
-	    @fields =  ('author','title','subject','keywords','abstract','notes','lowestgradelevel',
+	    @fields =  ('author','title','subject','keywords','abstract',
+			'notes','lowestgradelevel',
 	                'highestgradelevel','standards');
 	} else {
 	    @fields = ('author','title','subject','keywords','abstract','notes',
@@ -1182,9 +1191,18 @@ ENDEDIT
         }           
         if (! $Apache::lonpublisher::metadatafields{'copyright'}) {
                 $Apache::lonpublisher::metadatafields{'copyright'}=
-                'default';
+		    'default';
         }
 	if ($file_type eq 'portfolio') {
+	    if (! $Apache::lonpublisher::metadatafields{'mime'}) {
+                ($Apache::lonpublisher::metadatafields{'mime'}) =
+		    ( $target=~/\.(\w+)$/ );
+	    }
+	    if (! $Apache::lonpublisher::metadatafields{'owner'}) {
+		$Apache::lonpublisher::metadatafields{'owner'} =
+		    $env{'user.name'}.':'.$env{'user.domain'};
+	    }
+
 	    if ($Apache::lonpublisher::metadatafields{'courserestricted'} ne 'none') {
 		$r->print(&mt('Associated with course [_1]','<strong>'.$env{$Apache::lonpublisher::metadatafields{'courserestricted'}.".description"}.
 			      '</strong>').'<br />');