--- loncom/interface/lonmeta.pm	2005/11/15 19:20:12	1.127
+++ loncom/interface/lonmeta.pm	2005/11/22 19:43:53	1.132
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.127 2005/11/15 19:20:12 banghart Exp $
+# $Id: lonmeta.pm,v 1.132 2005/11/22 19:43:53 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -483,55 +483,59 @@ sub prettyinput {
     if (! defined($size)) {
         $size = 80;
     }
+    my $output;
     if (defined($course_key)) {
         my $stu_add;
         my $only_one;
-        my $values = $env{$course_key.'.metadata.'.$_.'.values'};
-        if ($env{$course_key.'.metadata.'.$_.'.options'} =~ m/stuadd/) {
+        my %meta_options;
+        my @cur_values_inst;
+        my $cur_values_stu;
+        my $values = $env{$course_key.'.metadata.'.$type.'.values'};
+        if ($env{$course_key.'.metadata.'.$type.'.options'} =~ m/stuadd/) {
             $stu_add = 'true';
         }
-        if ($env{$course_key.'.metadata.'.$_.'.options'} =~ m/onlyone/) {
+        if ($env{$course_key.'.metadata.'.$type.'.options'} =~ m/onlyone/) {
             $only_one = 'true';
         }
-        if ($type eq 'author') {
-            return 
-            '<input type="text" name="'.$fieldname.'" size="'.$size.'" '.
-            'value="'.$value.'" />'.
-        &relatedfield(1,$relatedsearchflag,$relatedsep,$fieldname,
-                      $relatedvalue); 
-            
+        # need to take instructor values out of list where instructor and student
+        # values may be mixed.
+        if ($values && $stu_add) {
+            foreach my $item (split(/,/,$values)) {
+                $item =~ s/^\s+//;
+                $meta_options{$item} = $type;
+            }
+            foreach my $item (split(/,/,$value)) {
+                $item =~ s/^\s+//;
+                if ($meta_options{$item}) {
+                    push(@cur_values_inst,$item);
+                } else {
+                    $cur_values_stu .= $item.',';
+                }
+            }
+        } else {
+            $cur_values_stu = $value;
         }
         if ($type eq 'courserestricted') {
             return ('<input type="hidden" name="new_courserestricted" value="'.$course_key.'" />');
         }
-        if ($type eq 'authorspace') {
-        }
-        if ($type eq 'modifyinguser') {
-        }
-        if ($type eq 'subject') {
-        }
-        if ($type eq 'keywords') {
-            my %hash;
-            my @cur_values;
-            foreach (split(/,/,$value)) {
-                $_ =~ s/^\s+//;
-                push(@cur_values,$_);
-            }
-            foreach (split(/,/,$values)) {
-                $_ =~ s/^\s+//;
-                $hash{$_} = $_;
+        if (($type eq 'keywords') || ($type eq 'subject')
+             || ($type eq 'author')||($type eq  'notes')
+             || ($type eq  'abstract')|| ($type eq  'title')) {
+            if ($values) {
+                if ($only_one) {
+                    $output .= (&Apache::loncommon::select_form($value,'new_'.$type,%meta_options));
+                } else {
+                    $output .= (&Apache::loncommon::multiple_select_form('new_'.$type,\@cur_values_inst,undef,\%meta_options));
+                }
             }
-            if ($only_one) {
-                return(&Apache::loncommon::select_form($value,'new_keywords',%hash));
-            } else {
-                return (&Apache::loncommon::multiple_select_form('new_keywords',\@cur_values,undef,\%hash));
+            if ($stu_add) {
+                $output .= '<input type="text" name="'.$fieldname.'" size="'.$size.'" '.
+                'value="'.$cur_values_stu.'" />'.
+                &relatedfield(1,$relatedsearchflag,$relatedsep,$fieldname,
+                      $relatedvalue); 
             }
+            return ($output);
         }
-        if ($type eq  'notes') {
-        }
-        if ($type eq  'abstract') {
-	}
-
         if (($type eq 'lowestgradelevel') ||
 	    ($type eq 'highestgradelevel')) {
 	    return &Apache::loncommon::select_level_form($value,$fieldname).
@@ -1095,44 +1099,38 @@ ENDEDIT
         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{$_}=
-                    join(',',&Apache::loncommon::get_env_multiple('form.new_'.$_));
+        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 $field_name = $_;
             if ($metacourse ne 'none') {
                 # handle restrictions here
-                if ($env{$metacourse.'.metadata.'.$_.'.options'} =~ m/active/){
-                    $output.=('<p>'.$lt{$_}.': '.
-                              &prettyinput($_,
-				   $Apache::lonpublisher::metadatafields{$_},
-				   'new_'.$_,'defaultmeta',undef,undef,undef,undef,$metacourse).'</p>');
-                 } elsif ($_ eq 'courserestricted') {
+                if ($env{$metacourse.'.metadata.'.$field_name.'.options'} =~ m/active/){
+                    $output.=('<p>'.$lt{$field_name}.': '.
+                              &prettyinput($field_name,
+				   $Apache::lonpublisher::metadatafields{$field_name},
+				   'new_'.$field_name,'defaultmeta',undef,undef,undef,undef,$metacourse).'</p>');
+                 } elsif ($field_name eq 'courserestricted') {
                             $output.=(
                                 &prettyinput($field_name,
-				    $Apache::lonpublisher::metadatafields{$_},
+				    $Apache::lonpublisher::metadatafields{$field_name},
 				    'new_'.$field_name,'defaultmeta',undef,undef,undef,undef,$metacourse));
                  }
             } else {
-                if ($_ ne 'courserestricted') {
-                    $output.=('<p>'.$lt{$_}.': '.
-                            &prettyinput($_,
-				   $Apache::lonpublisher::metadatafields{$_},
-				   'new_'.$_,'defaultmeta').'</p>');
+                if ($field_name ne 'courserestricted') {
+                    $output.=('<p>'.$lt{$field_name}.': '.
+                            &prettyinput($field_name,
+				   $Apache::lonpublisher::metadatafields{$field_name},
+				   'new_'.$field_name,'defaultmeta').'</p>');
 	        } else {
                     $output.=&prettyinput($field_name,
-				   $Apache::lonpublisher::metadatafields{$_},
+				   $Apache::lonpublisher::metadatafields{$field_name},
 				   'new_'.$field_name,'defaultmeta');
                 }
             }
         }
-        $output.=('<p>'.$lt{$_}.': '.
-                 &prettyinput($_,
-		 $Apache::lonpublisher::metadatafields{$_},
-		 'new_'.$_,'defaultmeta',undef,undef,undef,undef,$metacourse).'</p>');
-
         if ($env{'form.store'}) {
             my $mfh;
             my $formname='store';