--- loncom/interface/lonmeta.pm	2005/08/13 19:32:28	1.105
+++ loncom/interface/lonmeta.pm	2005/10/14 04:24:12	1.111
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.105 2005/08/13 19:32:28 banghart Exp $
+# $Id: lonmeta.pm,v 1.111 2005/10/14 04:24:12 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -290,16 +290,30 @@ 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/^(course\..+)\.metadata\..+\.options/) {
+            my $course_key = $1;
+            $course_key .= '.description';
+            $r->print($env{$course_key}.' of '.$course_key.'<br />');
+            push @courses, $key;
+        }
+    }
+    foreach (@courses) {
+        $r->print($_.' was found<br />');
+    }
+    $r->print('<h3>Portfolio 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" >');
     my $meta_not_found = 1;
-    foreach my $key (keys %env) {        
+    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('<h3>Portfolio Meta-Data</h3><br />');
                 $r->print('<form action="" method="post">');
                 $r->print('Select your course<br />');
                 $r->print('<select name="metacourse" >');
@@ -313,7 +327,7 @@ sub select_course {
     }
     unless ($meta_not_found) {
         $r->print('</select><br />');
-        $r->print('<input type="submit" value="Assign Instructor Metadata" />');
+        $r->print('<input type="submit" value="Assign Portfolio Metadata" />');
         $r->print('</form>');
     }
     return 'ok';
@@ -575,19 +589,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');  
-        } 
-        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,80 +928,7 @@ sub print_dynamic_metadata {
     $r->print("</table>");
     return;
 }
-sub save_instructor_metadata {
-    my ($r) = @_;
-    my $uri=$r->uri;
-    my $fn=&Apache::lonnet::filelocation('',$uri);
-    my @words =  &Apache::loncommon::get_env_multiple('form.keywords');
-    $r->print('This is the save instructor metadata area<br />');
-    my $mfh;
-    my $formname='store';
-    my $file_content;
-    foreach (sort keys %Apache::lonpublisher::metadatafields) {
-        next if ($_ =~ /\./);
-        my $unikey=$_;
-        $unikey=~/^([A-Za-z]+)/;
-        my $tag=$1;
-        $tag=~tr/A-Z/a-z/;
-        $file_content.= "\n\<$tag";
-        foreach (split(/\,/,
-                  $Apache::lonpublisher::metadatakeys{$unikey})
-                 ) {
-            my $value=$Apache::lonpublisher::metadatafields{$unikey.'.'.$_};
-            $value=~s/\"/\'\'/g;
-            $file_content.=' '.$_.'="'.$value.'"' ;
-                    # print $mfh ' '.$_.'="'.$value.'"';
-        }
-        $file_content.= '>'.
-        &HTML::Entities::encode
-              ($Apache::lonpublisher::metadatafields{$unikey},
-                     '<>&"').
-                     '</'.$tag.'>';
-    }
-
-    foreach my $word (@words) {
-        $r->print('You entered:'.$word.'<br />');
-    }
-    my $tag = 'keywords';
-    $file_content.= "\n\<$tag";
-    $file_content.= '>'.
-        &HTML::Entities::encode
-              (join(', ',@words),
-                     '<>&"').
-                     '</keywords>';
-    $fn =~ /\/portfolio\/(.*)$/;
-    my $new_fn = '/'.$1;
-    $env{'form.'.$formname}=$file_content;
-    $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').', '.
-                     &mt('FAIL').'</font></p>');
-    } else {
-        $r->print('<p><font color="blue">'.&mt('Wrote Metadata').
-	    ' '.&Apache::lonlocal::locallocaltime(time).
-	    '</font></p>');
-    }
-    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';
-}
+
 
 
 #####################################################
@@ -1012,6 +946,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$//;
@@ -1065,7 +1000,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);
         }
@@ -1080,7 +1015,7 @@ ENDEDIT
 	my $output;
 	my @fields;
 	if ($file_type eq 'portfolio') {
-	    @fields =  ('author','title','subject','keywords','abstract','notes','lowestgradelevel',
+	    @fields =  ('author','metadata.title','metadata.subject','metadata.keywords','abstract','notes','lowestgradelevel',
 	                'highestgradelevel');
 	} else {
 	    @fields = ('author','title','subject','keywords','abstract','notes',
@@ -1102,11 +1037,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=$_;