--- loncom/interface/lonmeta.pm	2005/08/09 00:24:55	1.104
+++ 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.104 2005/08/09 00:24:55 banghart Exp $
+# $Id: lonmeta.pm,v 1.106 2005/08/15 21:16:22 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -577,17 +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');  
-        } 
-        elsif ($env{'form.keywords'}) {
-            &save_instructor_metadata($r);
-            &select_course($r);
-        } 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
@@ -921,30 +912,7 @@ sub print_dynamic_metadata {
     $r->print("</table>");
     return;
 }
-sub save_instructor_metadata {
-    my ($r) = @_;
-    $r->print('This is the save instructor metadata area<br />');
-    my @words =  &Apache::loncommon::get_env_multiple('form.keywords');
-    foreach my $word (@words) {
-        $r->print('You entered:'.$word.'<br />');
-    }
-    return 'ok';
-}
-sub present_instructor_metadata {
-    my ($r,$uri, $file_type) = @_;
-    $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" value="Assign Meta-data" />');
-    $r->print('</form>');
-    return 'ok';
-}
+
 
 
 #####################################################
@@ -1052,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=$_;
@@ -1082,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','',