--- loncom/interface/lonmeta.pm	2005/08/25 20:46:32	1.107
+++ 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.107 2005/08/25 20:46:32 banghart Exp $
+# $Id: lonmeta.pm,v 1.132 2005/11/22 19:43:53 banghart 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,
@@ -290,30 +292,37 @@ sub fieldnames {
 
 sub select_course {
     my ($r)=@_;
-    $r->print('<h3>Instructor Selected Meta-Data</h3><br />');
+    my %courses;
+    foreach my $key (keys (%env)) { 
+        if ($key =~ m/\.metadata\./) {
+            $key =~ m/^course\.(.+)(\.metadata.+$)/;
+            my $course = $1;
+            my $coursekey = 'course.'.$course.'.description';
+            my $value = $env{$coursekey};
+            $courses{$coursekey} = $value;
+        }
+    }
+    $r->print('<h3>Course Related Meta-Data</h3><br />');
     $r->print('<form action="" method="post">');
-    $r->print('Select your course<br />');
+    $r->print('Select course restrictions<br />');
     $r->print('<select name="metacourse" >');
     my $meta_not_found = 1;
-    foreach my $key (keys %env) {        
-        if ($key =~ /\.metadata\./) {
-            if ($meta_not_found) {
-                undef($meta_not_found);
-                $r->print('<h3>Instructor Selected Meta-Data</h3><br />');
-                $r->print('<form action="" method="post">');
-                $r->print('Select your course<br />');
-                $r->print('<select name="metacourse" >');
-            }
-            my $course_key = $key;
-            $course_key =~ s/\.metadata\..*//;
-            $r->print('<option value="'.$course_key.'">');
-            $r->print($env{$course_key.'.description'});
-            $r->print('</option>');
+    foreach my $key (keys (%courses)) {    
+        if ($meta_not_found) {
+            undef($meta_not_found);
+            $r->print('<h3>Portfolio Meta-Data</h3><br />');
+            $r->print('<form action="" method="post">');
+            $r->print('Select your course<br />');
+            $r->print('<select name="metacourse" >');
         }
+        $key =~ m/(^.+)\.description$/;
+        $r->print('<option value="'.$1.'">');
+        $r->print($courses{$key});
+        $r->print('</option>');
     }
     unless ($meta_not_found) {
         $r->print('</select><br />');
-        $r->print('<input type="submit" value="Assign Instructor Metadata" />');
+        $r->print('<input type="submit" value="Assign Portfolio Metadata" />');
         $r->print('</form>');
     }
     return 'ok';
@@ -470,10 +479,70 @@ 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.'.$type.'.values'};
+        if ($env{$course_key.'.metadata.'.$type.'.options'} =~ m/stuadd/) {
+            $stu_add = 'true';
+        }
+        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 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 '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 ($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 '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,
@@ -575,6 +644,8 @@ sub handler {
         # Looking for all bombs?
         &report_bombs($r,$uri);
     } elsif ($uri=~/\/portfolio\//) {
+	($resdomain,$resuser)=
+	    (&Apache::lonnet::declutter($uri)=~m|^(\w+)/(\w+)/portfolio|);
         $r->print(&Apache::loncommon::bodytag
           ('Edit Portfolio File Information','','','',$resdomain));
         &present_editable_metadata($r,$uri,'portfolio');
@@ -930,6 +1001,7 @@ sub present_editable_metadata {
     my $fn=&Apache::lonnet::filelocation('',$uri);
     $disuri=~s/^\/\~/\/priv\//;
     $disuri=~s/\.meta$//;
+    $disuri=~s|^/editupload||;
     my $target=$uri;
     $target=~s/^\/\~/\/res\/$env{'request.role.domain'}\//;
     $target=~s/\.meta$//;
@@ -983,7 +1055,7 @@ ENDDEL
         %Apache::lonpublisher::metadatakeys=();
         my $result=&Apache::lonnet::getfile($fn);
         if ($result == -1){
-            $r->print('Creating new '.$fn);
+            $r->print('Creating new '.$disuri);
         } else {
             &Apache::lonpublisher::metaeval($result);
         }
@@ -999,7 +1071,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',
@@ -1007,46 +1079,67 @@ ENDEDIT
                  'lowestgradelevel','highestgradelevel','sourceavail','sourcerights',
                  'obsolete','obsoletereplacement');
         }
-        foreach (@fields) {
-            if (defined($env{'form.new_'.$_})) {
-                $Apache::lonpublisher::metadatafields{$_}=
-                    $env{'form.new_'.$_};
+        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'}) {
+        }
+        if (! $Apache::lonpublisher::metadatafields{'copyright'}) {
                 $Apache::lonpublisher::metadatafields{'copyright'}=
-                    'default';
-            }
-            $output.=('<p>'.$lt{$_}.': '.
-                      &prettyinput($_,
-				   $Apache::lonpublisher::metadatafields{$_},
-				   'new_'.$_,'defaultmeta').'</p>');
-            if ($env{'form.metacourse'}) {
-   
-    $r->print('This is the instructor metadata area<br />');
-    my @keywords = sort(split /, /,$env{$env{'form.metacourse'}.'.metadata.keywords'});
-    $r->print($env{'form.metacourse'}.'<br />');
-    $r->print('<form method="post" action="" size="3" >');
-    foreach my $word (@keywords) {
-        my $checked;
-        if ($Apache::lonpublisher::metadatafields{'coursekeyword'}=~ m/$word/) {
-            $checked = 1;
-        } else {
-            undef($checked);
+                'default';
         }
-        $r->print(&Apache::lonhtmlcommon::checkbox('keywords',$checked,$word).$word.'<br />');
-    }
-    $r->print('<br /><input type="submit" name="store" value="Assign Meta-data" />');
-    $r->print('</form>');
-    return 'ok';
+        if ($metacourse ne 'none') {
+             $r->print('Document metadata restricted by :<strong> '.$env{$metacourse.".description"}."</strong><br />");
+        }
+        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));
+            }
+            if ($metacourse ne 'none') {
+                # handle restrictions here
+                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{$field_name},
+				    'new_'.$field_name,'defaultmeta',undef,undef,undef,undef,$metacourse));
+                 }
+            } else {
+                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{$field_name},
+				   'new_'.$field_name,'defaultmeta');
+                }
             }
         }
         if ($env{'form.store'}) {
             my $mfh;
             my $formname='store'; 
             my $file_content;
-            if (&Apache::loncommon::get_env_multiple('form.keywords')) {
-            $Apache::lonpublisher::metadatafields{'coursekeyword'} = 
-                        join (', ', &Apache::loncommon::get_env_multiple('form.keywords'));
+            foreach my $meta_field (keys %env) {
+                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) {
                 next if ($_ =~ /\./);
@@ -1077,7 +1170,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').', '.