--- loncom/interface/lonmeta.pm	2005/08/02 21:35:10	1.102
+++ loncom/interface/lonmeta.pm	2005/08/15 21:16:22	1.106
@@ -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.106 2005/08/15 21:16:22 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -292,11 +292,18 @@ sub select_course {
     my ($r)=@_;
     $r->print('<h3>Instructor Selected Meta-Data</h3><br />');
     $r->print('<form action="" method="post">');
-    $r->print('Select your course<br>');
+    $r->print('Select your course<br />');
     $r->print('<select name="metacourse" >');
-    foreach my $key (keys %env) {
-        
+    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.'">');
@@ -304,9 +311,11 @@ sub select_course {
             $r->print('</option>');
         }
     }
-    $r->print('</select><br />');
-    $r->print('<input type="submit" >');
-    $r->print('</form>');
+    unless ($meta_not_found) {
+        $r->print('</select><br />');
+        $r->print('<input type="submit" value="Assign Instructor Metadata" />');
+        $r->print('</form>');
+    }
     return 'ok';
 }
 # Pretty printing of metadata field
@@ -568,13 +577,8 @@ sub handler {
     } elsif ($uri=~/\/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 +913,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';
-}
 
 
 #####################################################
@@ -1021,11 +1020,30 @@ ENDEDIT
                       &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" >');
+    $r->print('<select name="keywords" size="3" multiple>');
+    foreach my $word (@keywords) {
+        $r->print('<option>'.$word.'</option>');
+    }
+    $r->print('</select>');
+    $r->print('<br /><input type="submit" name="store" value="Assign Meta-data" />');
+    $r->print('</form>');
+    return 'ok';
+            }
         }
         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 (sort keys %Apache::lonpublisher::metadatafields) {
                 next if ($_ =~ /\./);
                 my $unikey=$_;
@@ -1051,6 +1069,8 @@ ENDEDIT
             if ($fn =~ /\/portfolio\//) {
                 $fn =~ /\/portfolio\/(.*)$/;
                 my $new_fn = '/'.$1;
+                
+                $r->print('<br />Just checking<br />');
                 $env{'form.'.$formname}=$file_content;
                 $env{'form.'.$formname.'.filename'}=$new_fn;
                 &Apache::lonnet::userfileupload('uploaddoc','',