--- loncom/interface/lonmeta.pm	2005/08/27 23:25:18	1.108
+++ loncom/interface/lonmeta.pm	2005/10/19 21:53:16	1.114
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.108 2005/08/27 23:25:18 banghart Exp $
+# $Id: lonmeta.pm,v 1.114 2005/10/19 21:53:16 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -237,8 +237,23 @@ sub diffgraph {
 # The field names
 sub fieldnames {
     my $file_type=shift;
-    my %fields = 
-        ('title' => 'Title',
+    my %fields;
+    %fields = 
+        (%fields,
+         'title' => 'Title',
+         'author' =>'Author(s)',
+         'authorspace' => 'Author Space',
+         'modifyinguser' => 'Last Modifying User',
+         'subject' => 'Subject',
+         'keywords' => 'Keyword(s)',
+         'notes' => 'Notes',
+         'abstract' => 'Abstract',
+         'lowestgradelevel' => 'Lowest Grade Level',
+         'highestgradelevel' => 'Highest Grade Level');
+    if ($file_type eq 'portfolio') {
+        %fields = 
+        (%fields,
+         'title' => 'Title',
          'author' =>'Author(s)',
          'authorspace' => 'Author Space',
          'modifyinguser' => 'Last Modifying User',
@@ -248,6 +263,21 @@ sub fieldnames {
          'abstract' => 'Abstract',
          'lowestgradelevel' => 'Lowest Grade Level',
          'highestgradelevel' => 'Highest Grade Level');
+    }
+    if ($file_type eq 'restrictedportfolio') {
+        %fields = 
+        (%fields,
+         'metadata.title' => 'Title',
+         'metadata.author' =>'Author(s)',
+         'metadata.authorspace' => 'Author Space',
+         'metadata.modifyinguser' => 'Last Modifying User',
+         'metadata.subject' => 'Subject',
+         'metadata.keywords' => 'Keyword(s)',
+         'metadata.notes' => 'Notes',
+         'metadata.abstract' => 'Abstract',
+         'metadata.lowestgradelevel' => 'Lowest Grade Level',
+         'metadata.highestgradelevel' => 'Highest Grade Level');
+    }        
     if (! defined($file_type) || $file_type ne 'portfolio') {
         %fields = 
         (%fields,
@@ -290,30 +320,36 @@ 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/\.metadata\./) {
+            $key =~ m/^course\.(.+)(\.metadata.+$)/;
+            my $course = $1;
+            my $coursekey = 'course.'.$course.'.description';
+            my $value = $env{$coursekey};
+            $courses{$coursekey} = $value;
+        }
+    }
+    $r->print('<h3>Course Related 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) {        
-        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.'">');
-            $r->print($env{$course_key.'.description'});
-            $r->print('</option>');
+    foreach my $key (keys (%courses)) {    
+        if ($meta_not_found) {
+            undef($meta_not_found);
+            $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" >');
         }
+        $r->print('<option value="'.$key.'">');
+        $r->print($courses{$key});
+        $r->print('</option>');
     }
     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,6 +611,8 @@ 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');
@@ -930,6 +968,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$//;
@@ -983,7 +1022,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);
         }
@@ -994,12 +1033,18 @@ ENDEDIT
         $r->print('<script language="JavaScript">'.
                   &Apache::loncommon::browser_and_searcher_javascript().
                   '</script>');
+        if (($file_type eq 'portfolio') && $env{'form.metacourse'}) {
+            $file_type = 'restrictedportfolio';
+        }
         my %lt=&fieldnames($file_type);
 	my $output;
 	my @fields;
 	if ($file_type eq 'portfolio') {
 	    @fields =  ('author','title','subject','keywords','abstract','notes','lowestgradelevel',
 	                'highestgradelevel');
+	} elsif ($file_type eq 'restrictedportfolio') {
+	    @fields =  ('metadata.author','metadata.title','metadata.subject','metadata.keywords','metadata.abstract','metadata.notes','metadata.lowestgradelevel',
+	                'metadata.highestgradelevel');
 	} else {
 	    @fields = ('author','title','subject','keywords','abstract','notes',
                  'copyright','customdistributionfile','language',
@@ -1020,37 +1065,7 @@ 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;