--- loncom/interface/lonmeta.pm	2005/08/02 17:01:20	1.101
+++ loncom/interface/lonmeta.pm	2005/10/06 22:20:30	1.110
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.101 2005/08/02 17:01:20 banghart Exp $
+# $Id: lonmeta.pm,v 1.110 2005/10/06 22:20:30 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -292,24 +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\./) {
+            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>');
+            $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
@@ -569,11 +575,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));
         &present_editable_metadata($r,$uri,'portfolio');
         &select_course($r);
-        
     } elsif ($uri=~/^\/\~/) { 
         # Construction space
         $r->print(&Apache::loncommon::bodytag
@@ -908,6 +915,8 @@ sub print_dynamic_metadata {
     return;
 }
 
+
+
 #####################################################
 #####################################################
 ###                                               ###
@@ -923,6 +932,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$//;
@@ -976,7 +986,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);
         }
@@ -1013,11 +1023,51 @@ ENDEDIT
                       &prettyinput($_,
 				   $Apache::lonpublisher::metadatafields{$_},
 				   'new_'.$_,'defaultmeta').'</p>');
+            if ($env{'form.metacourse'}) {
+                $r->print('This is the instructor metadata area<br />');
+                # have to find all the metadata items, so we'll loop through and find them
+                $r->print('<form method="post" action="" size="3" >');
+                $r->print('The course is: '.$env{'form.metacourse'}.'<br>');
+                foreach my $key (sort keys %env) {
+                    if ($key=~m/^($env{'form.metacourse'}\.metadata\.)(\d+)\.title/) {
+                        my $key_base = $1;
+                        my $item_num = $2;
+                        # found one, so let's display it
+                        my $title = $env{$key_base.$item_num.'.title'};
+                        my $type = $env{$key_base.$item_num.'.type'};
+                        my @choices = sort(split /, /,$env{$key_base.$item_num.'.values'});
+                        $r->print($title.'<br />');
+                        $r->print($type.'<br />');
+            
+            foreach my $word (@choices) {
+                my $checked;
+                if ($Apache::lonpublisher::metadatafields{'coursekeyword'}=~ m/$word/) {
+                    $checked = 1;
+                } else {
+                    undef($checked);
+                }
+                $r->print(&Apache::lonhtmlcommon::checkbox('instmeta_'.$env{'form.metacourse'}.'_'.$item_num,$checked,$word).$word.'<br />');
+            }
+        }
+    }   
+    $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 $formname='store'; 
             my $file_content;
+            foreach my $meta_field (keys %env) {
+                if ($meta_field=~m/^form.instmeta_(.+)_(\d+)$/) {
+                    $r->print('Found a field<br>');
+                }
+                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=$_;