--- loncom/interface/lonmeta.pm	2005/10/25 18:46:03	1.117
+++ loncom/interface/lonmeta.pm	2005/11/08 03:08:15	1.124
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.117 2005/10/25 18:46:03 albertel Exp $
+# $Id: lonmeta.pm,v 1.124 2005/11/08 03:08:15 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -247,7 +247,9 @@ sub fieldnames {
          'notes' => 'Notes',
          'abstract' => 'Abstract',
          'lowestgradelevel' => 'Lowest Grade Level',
-         'highestgradelevel' => 'Highest Grade Level');
+         'highestgradelevel' => 'Highest Grade Level',
+         'courserestricted' => 'Course Restricting Metadata');
+         
     if (! defined($file_type) || $file_type ne 'portfolio') {
         %fields = 
         (%fields,
@@ -313,7 +315,8 @@ sub select_course {
             $r->print('Select your course<br />');
             $r->print('<select name="metacourse" >');
         }
-        $r->print('<option value="'.$key.'">');
+        $key =~ m/(^.+)\.description$/;
+        $r->print('<option value="'.$1.'">');
         $r->print($courses{$key});
         $r->print('</option>');
     }
@@ -483,6 +486,7 @@ sub prettyinput {
     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/) {
             $stu_add = 'true';
         }
@@ -491,6 +495,9 @@ sub prettyinput {
         }
         if ($type eq 'author') {
         }
+        if ($type eq 'courserestricted') {
+            return ('<input type="hidden" name="new_courserestricted" value="'.$course_key.'" />');
+        }
         if ($type eq 'authorspace') {
         }
         if ($type eq 'modifyinguser') {
@@ -498,10 +505,28 @@ sub prettyinput {
         if ($type eq 'subject') {
         }
         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',\@cur_values,undef,\%hash));
+            }
         }
         if ($type eq  'notes') {
         }
         if ($type eq  'abstract') {
+	}
+
         if (($type eq 'lowestgradelevel') ||
 	    ($type eq 'highestgradelevel')) {
 	    return &Apache::loncommon::select_level_form($value,$fieldname).
@@ -1037,7 +1062,7 @@ ENDEDIT
 	my @fields;
 	if ($file_type eq 'portfolio') {
 	    @fields =  ('author','title','subject','keywords','abstract','notes','lowestgradelevel',
-	                'highestgradelevel');
+	                'highestgradelevel','courserestricted');
 	} else {
 	    @fields = ('author','title','subject','keywords','abstract','notes',
                  'copyright','customdistributionfile','language',
@@ -1045,24 +1070,36 @@ ENDEDIT
                  'lowestgradelevel','highestgradelevel','sourceavail','sourcerights',
                  'obsolete','obsoletereplacement');
         }
+        my $metacourse;
+        if ($env{'form.metacourse'} ) {
+            $Apache::lonpublisher::metadatafields{'courserestricted'} = $env{'form.metacourse'};
+            $metacourse = $env{'form.metacourse'};
+         } else {
+            if (! $Apache::lonpublisher::metadatafields{'courserestricted'}) {
+                $Apache::lonpublisher::metadatafields{'courserestricted'}=
+                    'none';
+                $metacourse = 'none';
+            } else {
+                $metacourse = $Apache::lonpublisher::metadatafields{'courserestricted'};
+            }
+        }
+        if (! $Apache::lonpublisher::metadatafields{'copyright'}) {
+                $Apache::lonpublisher::metadatafields{'copyright'}=
+                'default';
+        }
         foreach (@fields) {
             if (defined($env{'form.new_'.$_})) {
                 $Apache::lonpublisher::metadatafields{$_}=
-                    $env{'form.new_'.$_};
-            }
-            if (! $Apache::lonpublisher::metadatafields{'copyright'}) {
-                $Apache::lonpublisher::metadatafields{'copyright'}=
-                    'default';
+                    join(',',&Apache::loncommon::get_env_multiple('form.new_'.$_));
             }
-            if ($env{'form.metacourse'}) {
+            if ($metacourse ne 'none') {
                 # handle restrictions here
-                $env{'form.metacourse'} =~ m/(^.+)\.description$/;
-                my $key_base = $1;
-                if ($env{$key_base.'.metadata.'.$_.'.options'} =~ m/active/) {
+                if (($env{$metacourse.'.metadata.'.$_.'.options'} =~ m/active/)||
+                    ($_ eq 'courserestricted'))  {
                     $output.=('<p>'.$lt{$_}.': '.
                             &prettyinput($_,
 				   $Apache::lonpublisher::metadatafields{$_},
-				   'new_'.$_,'defaultmeta',undef,undef,undef,undef,$key_base).'</p>');
+				   'new_'.$_,'defaultmeta',undef,undef,undef,undef,$metacourse).'</p>');
                 }
             } else {
                 $output.=('<p>'.$lt{$_}.': '.
@@ -1076,9 +1113,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) {