--- loncom/interface/lonmeta.pm	2005/10/17 21:36:44	1.113
+++ loncom/interface/lonmeta.pm	2005/11/18 23:47:33	1.128
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.113 2005/10/17 21:36:44 banghart Exp $
+# $Id: lonmeta.pm,v 1.128 2005/11/18 23:47:33 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -237,11 +237,8 @@ sub diffgraph {
 # The field names
 sub fieldnames {
     my $file_type=shift;
-    my %fields;
-    if ($file_type eq 'portfolio') {
-        %fields = 
-        (%fields,
-         'title' => 'Title',
+    my %fields = 
+        ('title' => 'Title',
          'author' =>'Author(s)',
          'authorspace' => 'Author Space',
          'modifyinguser' => 'Last Modifying User',
@@ -250,22 +247,9 @@ sub fieldnames {
          'notes' => 'Notes',
          'abstract' => 'Abstract',
          'lowestgradelevel' => 'Lowest Grade Level',
-         'highestgradelevel' => 'Highest Grade Level');
-    }
-    if ($file_type eq 'restrictedportfolio') {
-        %fields = 
-        (%fields,
-         'metadata.title' => 'Title',
-         'metadata.author' =>'Author(s)',
-         'metadata.authorspace' => 'Author Space',
-         'metadata.modifyinguser' => 'Last Modifying User',
-         'metadata.subject' => 'Subject',
-         'metadata.keywords' => 'Keyword(s)',
-         'metadata.notes' => 'Notes',
-         'metadata.abstract' => 'Abstract',
-         'metadata.lowestgradelevel' => 'Lowest Grade Level',
-         'metadata.highestgradelevel' => 'Highest Grade Level');
-    }        
+         'highestgradelevel' => 'Highest Grade Level',
+         'courserestricted' => 'Course Restricting Metadata');
+         
     if (! defined($file_type) || $file_type ne 'portfolio') {
         %fields = 
         (%fields,
@@ -320,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)) {    
@@ -331,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>');
     }
@@ -494,10 +479,83 @@ sub relatedfield {
 
 sub prettyinput {
     my ($type,$value,$fieldname,$formname,
-	$relatedsearchflag,$relatedsep,$relatedvalue,$size)=@_;
+	$relatedsearchflag,$relatedsep,$relatedvalue,$size,$course_key)=@_;
     if (! defined($size)) {
         $size = 80;
     }
+    my $output;
+    if (defined($course_key)) {
+        my $stu_add;
+        my $only_one;
+        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/) {
+            $stu_add = 'true';
+        }
+        if ($env{$course_key.'.metadata.'.$_.'.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{$_} = $_;
+            }
+            foreach (split(/,/,$value)) {
+                $_ =~ s/^\s+//;
+                if ($meta_options{$_}) {
+                    push(@cur_values_inst,$_);
+                } else {
+                    $cur_values_stu .= $_.',';
+                }
+            }
+        }
+        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') {
+        }
+        if ($type eq 'modifyinguser') {
+        }
+        if ($type eq 'subject') {
+        }
+        if ($type eq 'keywords') {
+            if ($only_one) {
+                $output .= (&Apache::loncommon::select_form($value,'new_keywords',%meta_options));
+            } else {
+                $output .= (&Apache::loncommon::multiple_select_form('new_keywords',\@cur_values_inst,undef,\%meta_options));
+            }
+            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).
+            &relatedfield(0,$relatedsearchflag,$relatedsep); 
+        }
+        return(); 
+    }
     # Language
     if ($type eq 'language') {
 	return &selectbox($fieldname,
@@ -1026,7 +1084,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',
@@ -1034,62 +1092,72 @@ 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';
+        }
+        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 (! $Apache::lonpublisher::metadatafields{'copyright'}) {
-                $Apache::lonpublisher::metadatafields{'copyright'}=
-                    'default';
-            }
-            $output.=('<p>'.$lt{$_}.': '.
-                      &prettyinput($_,
+            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') {
+                            $output.=(
+                                &prettyinput($field_name,
+				    $Apache::lonpublisher::metadatafields{$_},
+				    'new_'.$field_name,'defaultmeta',undef,undef,undef,undef,$metacourse));
+                 }
+            } else {
+                if ($_ ne 'courserestricted') {
+                    $output.=('<p>'.$lt{$_}.': '.
+                            &prettyinput($_,
 				   $Apache::lonpublisher::metadatafields{$_},
 				   'new_'.$_,'defaultmeta').'</p>');
-            if ($env{'form.metacourse'}) {
-                $r->print('This is the instructor metadata area<br />');
-                # have to find all the metadata items, so we'll loop through and find them
-                $r->print('<form method="post" action="" size="3" >');
-                $r->print('The course is: '.$env{'form.metacourse'}.'<br>');
-                foreach my $key (sort keys %env) {
-                    if ($key=~m/^($env{'form.metacourse'}\.metadata\.)(\d+)\.title/) {
-                        my $key_base = $1;
-                        my $item_num = $2;
-                        # found one, so let's display it
-                        my $title = $env{$key_base.$item_num.'.title'};
-                        my $type = $env{$key_base.$item_num.'.type'};
-                        my @choices = sort(split /, /,$env{$key_base.$item_num.'.values'});
-                        $r->print($title.'<br />');
-                        $r->print($type.'<br />');
-            
-            foreach my $word (@choices) {
-                my $checked;
-                if ($Apache::lonpublisher::metadatafields{'coursekeyword'}=~ m/$word/) {
-                    $checked = 1;
-                } else {
-                    undef($checked);
+	        } else {
+                    $output.=&prettyinput($field_name,
+				   $Apache::lonpublisher::metadatafields{$_},
+				   'new_'.$field_name,'defaultmeta');
                 }
-                $r->print(&Apache::lonhtmlcommon::checkbox('instmeta_'.$env{'form.metacourse'}.'_'.$item_num,$checked,$word).$word.'<br />');
-            }
-        }
-    }   
-    $r->print('<br /><input type="submit" name="store" value="Assign Meta-data" />');
-    $r->print('</form>');
-    return 'ok';
             }
         }
+        $output.=('<p>'.$lt{$_}.': '.
+                 &prettyinput($_,
+		 $Apache::lonpublisher::metadatafields{$_},
+		 'new_'.$_,'defaultmeta',undef,undef,undef,undef,$metacourse).'</p>');
+
         if ($env{'form.store'}) {
             my $mfh;
             my $formname='store'; 
             my $file_content;
             foreach my $meta_field (keys %env) {
-                if ($meta_field=~m/^form.instmeta_(.+)_(\d+)$/) {
-                    $r->print('Found a field<br>');
-                }
-                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) {
@@ -1121,7 +1189,6 @@ ENDEDIT
                 $env{'form.'.$formname.'.filename'}=$new_fn;
                 &Apache::lonnet::userfileupload('uploaddoc','',
 	        	 'portfolio'.$env{'form.currentpath'});
-	        my $status =&Apache::lonnet::userfileupload($formname,'','portfolio');
                 if (&Apache::lonnet::userfileupload($formname,'','portfolio') eq 'error: no uploaded file') {
                     $r->print('<p><font color="red">'.
                       &mt('Could not write metadata').', '.