--- loncom/interface/lonmeta.pm	2005/10/31 01:49:21	1.120
+++ loncom/interface/lonmeta.pm	2005/11/11 21:25:50	1.125
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.120 2005/10/31 01:49:21 banghart Exp $
+# $Id: lonmeta.pm,v 1.125 2005/11/11 21:25:50 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -304,7 +304,7 @@ sub select_course {
     }
     $r->print('<h3>Course Related Meta-Data</h3><br />');
     $r->print('<form action="" method="post">');
-    $r->print('Select your test course<br />');
+    $r->print('Select course restrictions<br />');
     $r->print('<select name="metacourse" >');
     my $meta_not_found = 1;
     foreach my $key (keys (%courses)) {    
@@ -494,6 +494,15 @@ sub prettyinput {
             $only_one = 'true';
         }
         if ($type eq 'author') {
+            return 
+            '<input type="text" name="'.$fieldname.'" size="'.$size.'" '.
+            'value="'.$value.'" />'.
+        &relatedfield(1,$relatedsearchflag,$relatedsep,$fieldname,
+                      $relatedvalue); 
+            
+        }
+        if ($type eq 'courserestricted') {
+            return ('<input type="hidden" name="new_courserestricted" value="'.$course_key.'" />');
         }
         if ($type eq 'authorspace') {
         }
@@ -504,13 +513,19 @@ sub prettyinput {
         if ($type eq 'keywords') {
             my %hash;
             my $def;
+            my @cur_values;
+            foreach (split(/,/,$value)) {
+                $_ =~ s/^\s+//;
+                push(@cur_values,$_);
+            }
             foreach (split(/,/,$values)) {
+                $_ =~ s/^\s+//;
                 $hash{$_} = $_;
             }
             if ($only_one) {
                 return(&Apache::loncommon::select_form($def,'new_keywords',%hash));
             } else {
-                return(&Apache::loncommon::multiple_select_form('new_keywords',undef,undef,%hash));
+                return (&Apache::loncommon::multiple_select_form('new_keywords',\@cur_values,undef,\%hash));
             }
         }
         if ($type eq  'notes') {
@@ -1078,15 +1093,19 @@ ENDEDIT
                 $Apache::lonpublisher::metadatafields{'copyright'}=
                 'default';
         }
-        &Apache::lonnet::logthis($metacourse.' is the restriction');
+        if ($metacourse ne 'none') {
+             $r->print('Document metadata restricted by :<strong> '.$env{$metacourse.".description"}."</strong><br />");
+        }
+        
         foreach (@fields) {
             if (defined($env{'form.new_'.$_})) {
                 $Apache::lonpublisher::metadatafields{$_}=
-                    $env{'form.new_'.$_};
+                    join(',',&Apache::loncommon::get_env_multiple('form.new_'.$_));
             }
             if ($metacourse ne 'none') {
                 # handle restrictions here
-                if ($env{$metacourse.'.metadata.'.$_.'.options'} =~ m/active/) {
+                if (($env{$metacourse.'.metadata.'.$_.'.options'} =~ m/active/)||
+                    ($_ eq 'courserestricted'))  {
                     $output.=('<p>'.$lt{$_}.': '.
                             &prettyinput($_,
 				   $Apache::lonpublisher::metadatafields{$_},
@@ -1104,9 +1123,9 @@ ENDEDIT
             my $formname='store'; 
             my $file_content;
             foreach my $meta_field (keys %env) {
-                if (&Apache::loncommon::get_env_multiple('form.keywords')) {
-                $Apache::lonpublisher::metadatafields{'coursekeyword'} = 
-                        join (', ', &Apache::loncommon::get_env_multiple('form.keywords'));
+                if (&Apache::loncommon::get_env_multiple('form.new_keywords')) {
+                    $Apache::lonpublisher::metadatafields{'keywords'} = 
+                        join (',', &Apache::loncommon::get_env_multiple('form.new_keywords'));
                 }
             }
             foreach (sort keys %Apache::lonpublisher::metadatafields) {