--- loncom/interface/lonmeta.pm	2003/04/15 00:53:04	1.31
+++ loncom/interface/lonmeta.pm	2003/09/09 18:46:28	1.34
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.31 2003/04/15 00:53:04 www Exp $
+# $Id: lonmeta.pm,v 1.34 2003/09/09 18:46:28 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -70,7 +70,7 @@ sub dynamicmeta {
                    'usage'        => 'cnt'
                    );
     foreach (keys %evaldata) {
-	my ($item,$purl,$cat)=split(/\_\_\_/,$_);
+	my ($item,$purl,$cat)=&Apache::lonnet::decode_symb($_);
 ###	print "\n".$_.' - '.$item.'<br />';
         if (defined($cnt{$cat})) { $cnt{$cat}++; } else { $cnt{$cat}=1; }
         unless ($listitems{$cat} eq 'app') {
@@ -290,6 +290,7 @@ ENDHEAD
   delete($content{'lastrevisiondate'});
   delete($content{'owner'});
   delete($content{'copyright'});
+  delete($content{'customdistributionfile'});
   if ($ENV{'user.adv'}) {
 # ------------------------------------------------------------ Dynamic Metadata
    $r->print(
@@ -382,20 +383,22 @@ $dynmeta{$_}."&nbsp;</td></tr>\n");
  '<h3>Additional Metadata (non-standard, parameters, exports)</h3>');
    foreach (sort keys %content) {
       my $name=$_;
-      my $display=&Apache::lonnet::metadata($uri,$name.'.display');
-      unless ($display) { $display=$name; };
-      my $otherinfo='';
-      foreach ('name','part','type','default') {
-          if (defined(&Apache::lonnet::metadata($uri,$name.'.'.$_))) {
-             $otherinfo.=' '.$_.'='.
-		 &Apache::lonnet::metadata($uri,$name.'.'.$_).'; ';
-          }
+      unless ($name=~/\.display$/) {
+	  my $display=&Apache::lonnet::metadata($uri,$name.'.display');
+	  unless ($display) { $display=$name; };
+	  my $otherinfo='';
+	  foreach ('name','part','type','default') {
+	      if (defined(&Apache::lonnet::metadata($uri,$name.'.'.$_))) {
+		  $otherinfo.=' '.$_.'='.
+		      &Apache::lonnet::metadata($uri,$name.'.'.$_).'; ';
+	      }
+	  }
+	  $r->print('<b>'.$display.':</b> '.$content{$name});
+	  if ($otherinfo) {
+	      $r->print(' ('.$otherinfo.')');
+	  }
+	  $r->print("<br>\n");
       }
-      $r->print('<b>'.$display.':</b> '.$content{$name});
-      if ($otherinfo) {
-         $r->print(' ('.$otherinfo.')');
-      }
-      $r->print("<br>\n");
    }
   }
 # ===================================================== End Resource Space Call
@@ -434,9 +437,20 @@ ENDEDIT
        if ($ENV{'form.new_'.$_}) {
 	   $Apache::lonpublisher::metadatafields{$_}=$ENV{'form.new_'.$_};
        }
-       $r->print(
-         &Apache::lonpublisher::textfield($_,'new_'.$_,
-                                 $Apache::lonpublisher::metadatafields{$_}));
+       if (m/copyright/) {
+	   $r->print(&Apache::lonpublisher::selectbox($_,'new_'.$_,
+			       $Apache::lonpublisher::metadatafields{$_},
+			       \&Apache::loncommon::copyrightdescription,
+			       (&Apache::loncommon::copyrightids)));
+       } elsif (m/language/) {
+	   $r->print(&Apache::lonpublisher::selectbox($_,'new_'.$_,
+			      $Apache::lonpublisher::metadatafields{$_},
+			      \&Apache::loncommon::languagedescription,
+			      (&Apache::loncommon::languageids)));
+       } else {
+	   $r->print(&Apache::lonpublisher::textfield($_,'new_'.$_,
+			     $Apache::lonpublisher::metadatafields{$_}));
+       }
    }
    if ($ENV{'form.store'}) {
       my $mfh;