--- loncom/interface/lonmeta.pm	2005/07/15 12:57:53	1.100
+++ loncom/interface/lonmeta.pm	2005/08/04 23:47:37	1.103
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.100 2005/07/15 12:57:53 banghart Exp $
+# $Id: lonmeta.pm,v 1.103 2005/08/04 23:47:37 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -292,21 +292,30 @@ 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>'.$env{'user.domain'});
+    $r->print('Select your course<br />');
     $r->print('<select name="metacourse" >');
-    $r->print('<input type="submit" >');
-    $r->print('</form>');
-    
-    foreach my $key (keys %env) {
+    my $meta_not_found = 1;
+    foreach my $key (keys %env) {        
         if ($key =~ /\.metadata\./) {
-            $r->print('<option>');
-            $r->print($key);
+            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>');
         }
     }
-    $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,8 +577,12 @@ sub handler {
     } elsif ($uri=~/\/portfolio\//) {
         $r->print(&Apache::loncommon::bodytag
           ('Edit Portfolio File Information','','','',$resdomain));
-        &present_editable_metadata($r,$uri,'portfolio');
-        &select_course($r);
+        if ($env{'form.metacourse'}) {
+            &present_instructor_metadata($r,$uri,'portfolio');  
+        } else {
+            &present_editable_metadata($r,$uri,'portfolio');
+            &select_course($r);
+        }
         
     } elsif ($uri=~/^\/\~/) { 
         # Construction space
@@ -905,6 +918,16 @@ sub print_dynamic_metadata {
     return;
 }
 
+sub present_instructor_metadata {
+    my ($r,$uri, $file_type) = @_;
+    $r->print('This is the instructor metadata area<br />');
+    my $keywords = $env{$env{'form.metacourse'}.'.metadata.keywords'};
+    $r->print($env{'form.metacourse'}.'<br />');
+    $r->print('the keywords are: '.$keywords);
+    return 'ok';
+}
+
+
 #####################################################
 #####################################################
 ###                                               ###