--- loncom/interface/lonmeta.pm	2007/01/16 07:36:10	1.200
+++ loncom/interface/lonmeta.pm	2007/03/12 19:10:48	1.204
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.200 2007/01/16 07:36:10 raeburn Exp $
+# $Id: lonmeta.pm,v 1.204 2007/03/12 19:10:48 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -631,14 +631,15 @@ sub prettyinput {
                 if ($meta_options{$item}) {
                     push(@cur_values_inst,$item);
                 } else {
-                    if ($item ne 'Not Specified') {
+                    if ($item ne '') {
                         $cur_values_stu .= $item.',';
                     }
                 }
             }
+             $cur_values_stu =~ s/,$//;
             my @key_order = sort(keys(%meta_options));
-            unshift (@key_order,'Not Specified');
-            $meta_options{'Not Specified'} = 'Not Specified';
+            unshift(@key_order,'');
+            $meta_options{''} = 'Not specified';
             $meta_options{'select_form_order'} = \@key_order;
         } else {
             $cur_values_stu = $value;
@@ -803,8 +804,10 @@ sub handler {
         &present_editable_metadata($r,$uri,'groups');    
     } elsif ($uri=~m|^/~|) { 
         # Construction space
-        $r->print(&Apache::loncommon::start_page('Edit Catalog nformation',
-						 undef,
+        $r->print(&Apache::loncommon::start_page('Edit Catalog Information',
+						"\n".'<script type="text/javascript">'."\n".
+                                                &Apache::loncommon::browser_and_searcher_javascript().
+                                                "\n".'</script>',
 						 {'domain' => $resdomain,}));
         &present_editable_metadata($r,$uri);
     } else {
@@ -1209,7 +1212,12 @@ ENDBOMBS
 <input type="submit" name="clearmsg" value="$clear" />
 ENDDEL
         } else {
-            $r->print('<a href="'.$disuri.'" />'.$goback.'</a>');
+            $r->print('<p><a href="'.$disuri.'" />'.$goback.'</a></p>');
+	    if ($env{'form.clearmsg'}) {
+		my ($diruri) = ($disuri =~ m{(.*/)[^/]*});
+		$r->print('<p><a href="'.$diruri.'" />'.
+			  &mt('Back To Directory').'</a></p>');
+	    }
 	}
 	$r->print('<br />'.$bombs);
     } else {
@@ -1249,9 +1257,6 @@ ENDDEL
 <h1>$displayfile</h1>
 <form method="post" action="" name="defaultmeta">
 ENDEDIT
-        $r->print('<script type="JavaScript">'.
-                  &Apache::loncommon::browser_and_searcher_javascript().
-                  '</script>');
         my %lt=&fieldnames($file_type);
 	my $output;
 	my @fields;
@@ -1340,8 +1345,15 @@ ENDEDIT
         my $row_alt = 1;
         foreach my $field_name (@fields) {
             if (defined($env{'form.new_'.$field_name})) {
-                $Apache::lonpublisher::metadatafields{$field_name}=
-                    join(',',&Apache::loncommon::get_env_multiple('form.new_'.$field_name));
+                my @values = &Apache::loncommon::get_env_multiple('form.new_'.$field_name);
+                my $newvalue = '';
+                foreach my $item (@values) {
+                    if ($item ne '') {
+                        $newvalue .= $item.',';
+                    }
+                }
+                $newvalue =~ s/,$//; 
+                $Apache::lonpublisher::metadatafields{$field_name}=$newvalue;
             }
             if ($Apache::lonpublisher::metadatafields{'courserestricted'} ne 'none'
 		&& exists($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.'.$field_name.'.options'})) {