--- loncom/interface/lonmeta.pm	2005/08/02 21:35:10	1.102
+++ loncom/interface/lonmeta.pm	2005/10/21 19:20:58	1.115
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.102 2005/08/02 21:35:10 banghart Exp $
+# $Id: lonmeta.pm,v 1.115 2005/10/21 19:20:58 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -290,23 +290,38 @@ 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 your test course<br />');
     $r->print('<select name="metacourse" >');
-    foreach my $key (keys %env) {
-        
-        if ($key =~ /\.metadata\./) {
-            my $course_key = $key;
-            $course_key =~ s/\.metadata\..*//;
-            $r->print('<option value="'.$course_key.'">');
-            $r->print($env{$course_key.'.description'});
-            $r->print('</option>');
+    my $meta_not_found = 1;
+    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" >');
         }
+        $r->print('<option value="'.$key.'">');
+        $r->print($courses{$key});
+        $r->print('</option>');
+    }
+    unless ($meta_not_found) {
+        $r->print('</select><br />');
+        $r->print('<input type="submit" value="Assign Portfolio Metadata" />');
+        $r->print('</form>');
     }
-    $r->print('</select><br />');
-    $r->print('<input type="submit" >');
-    $r->print('</form>');
     return 'ok';
 }
 # Pretty printing of metadata field
@@ -566,15 +581,12 @@ 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));
-        if ($env{'form.metacourse'}) {
-            &present_instructor_metadata($r,$uri,'portfolio');  
-        } else {
-            &present_editable_metadata($r,$uri,'portfolio');
-            &select_course($r);
-        }
-        
+        &present_editable_metadata($r,$uri,'portfolio');
+        &select_course($r);
     } elsif ($uri=~/^\/\~/) { 
         # Construction space
         $r->print(&Apache::loncommon::bodytag
@@ -909,11 +921,6 @@ sub print_dynamic_metadata {
     return;
 }
 
-sub present_instructor_metadata {
-    my ($r,$uri, $file_type) = @_;
-    print $r->print('This is the instructor metadata area'); 
-    return 'ok';
-}
 
 
 #####################################################
@@ -931,6 +938,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$//;
@@ -984,7 +992,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);
         }
@@ -1017,15 +1025,33 @@ ENDEDIT
                 $Apache::lonpublisher::metadatafields{'copyright'}=
                     'default';
             }
-            $output.=('<p>'.$lt{$_}.': '.
-                      &prettyinput($_,
+            if ($env{'form.metacourse'}) {
+                # handle restrictions here
+                $env{'form.metacourse'} =~ m/(^.+)\.description$/;
+                my $key_base = $1;
+                if ($env{$key_base.'.metadata.'.$_.'.options'} =~ m/active/) {
+                    $output.=('<p>'.$lt{$_}.': '.
+                            &prettyinput($_,
 				   $Apache::lonpublisher::metadatafields{$_},
 				   'new_'.$_,'defaultmeta').'</p>');
+                }
+            } else {
+                $output.=('<p>'.$lt{$_}.': '.
+                            &prettyinput($_,
+				   $Apache::lonpublisher::metadatafields{$_},
+				   'new_'.$_,'defaultmeta').'</p>');
+            }
         }
         if ($env{'form.store'}) {
             my $mfh;
-            my $formname='store';
+            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'));
+                }
+            }
             foreach (sort keys %Apache::lonpublisher::metadatafields) {
                 next if ($_ =~ /\./);
                 my $unikey=$_;
@@ -1055,7 +1081,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').', '.