--- loncom/interface/lonmeta.pm	2005/11/19 00:16:01	1.130
+++ loncom/interface/lonmeta.pm	2005/11/22 23:20:40	1.133
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.130 2005/11/19 00:16:01 banghart Exp $
+# $Id: lonmeta.pm,v 1.133 2005/11/22 23:20:40 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -240,7 +240,10 @@ sub fieldnames {
     my %fields = 
         ('title' => 'Title',
          'author' =>'Author(s)',
+         'authorspace' => 'Author Space',
+         'modifyinguser' => 'Last Modifying User',
          'subject' => 'Subject',
+         'standards' => 'Standards',
          'keywords' => 'Keyword(s)',
          'notes' => 'Notes',
          'abstract' => 'Abstract',
@@ -252,7 +255,6 @@ sub fieldnames {
         %fields = 
         (%fields,
          'domain' => 'Domain',
-         'standards' => 'Standards',
          'mime' => 'MIME Type',
          'language' => 'Language',
          'creationdate' => 'Creation Date',
@@ -282,7 +284,7 @@ sub fieldnames {
          'stdno'      => 'Total number of students who have worked on this problem',
          'difficulty' => 'Degree of difficulty',
          'disc'       => 'Degree of discrimination',
-	 'dependencies' => 'Resources used by this resource',
+	     'dependencies' => 'Resources used by this resource',
          );
     }
     return &Apache::lonlocal::texthash(%fields);
@@ -488,26 +490,26 @@ sub prettyinput {
         my %meta_options;
         my @cur_values_inst;
         my $cur_values_stu;
-        my $values = $env{$course_key.'.metadata.'.$_.'.values'};
-        if ($env{$course_key.'.metadata.'.$_.'.options'} =~ m/stuadd/) {
+        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';
         }
         # need to take instructor values out of list where instructor and student
         # values may be mixed.
-        if ($values && $stu_add) {
-            foreach (split(/,/,$values)) {
-                $_ =~ s/^\s+//;
-                $meta_options{$_} = $_;
+        if ($values) {
+            foreach my $item (split(/,/,$values)) {
+                $item =~ s/^\s+//;
+                $meta_options{$item} = $item;
             }
-            foreach (split(/,/,$value)) {
-                $_ =~ s/^\s+//;
-                if ($meta_options{$_}) {
-                    push(@cur_values_inst,$_);
+            foreach my $item (split(/,/,$value)) {
+                $item =~ s/^\s+//;
+                if ($meta_options{$item}) {
+                    push(@cur_values_inst,$item);
                 } else {
-                    $cur_values_stu .= $_.',';
+                    $cur_values_stu .= $item.',';
                 }
             }
         } else {
@@ -518,7 +520,7 @@ sub prettyinput {
         }
         if (($type eq 'keywords') || ($type eq 'subject')
              || ($type eq 'author')||($type eq  'notes')
-             || ($type eq  'abstract')|| ($type eq  'title')) {
+             || ($type eq  'abstract')|| ($type eq  'title')|| ($type eq  'standards')) {
             if ($values) {
                 if ($only_one) {
                     $output .= (&Apache::loncommon::select_form($value,'new_'.$type,%meta_options));
@@ -1069,7 +1071,7 @@ ENDEDIT
 	my @fields;
 	if ($file_type eq 'portfolio') {
 	    @fields =  ('author','title','subject','keywords','abstract','notes','lowestgradelevel',
-	                'highestgradelevel','courserestricted');
+	                'highestgradelevel','standards','courserestricted');
 	} else {
 	    @fields = ('author','title','subject','keywords','abstract','notes',
                  'copyright','customdistributionfile','language',
@@ -1097,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';