--- loncom/interface/lonmeta.pm	2005/10/17 21:36:44	1.113
+++ loncom/interface/lonmeta.pm	2005/10/21 19:20:58	1.115
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.113 2005/10/17 21:36:44 banghart Exp $
+# $Id: lonmeta.pm,v 1.115 2005/10/21 19:20:58 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -237,11 +237,8 @@ sub diffgraph {
 # The field names
 sub fieldnames {
     my $file_type=shift;
-    my %fields;
-    if ($file_type eq 'portfolio') {
-        %fields = 
-        (%fields,
-         'title' => 'Title',
+    my %fields = 
+        ('title' => 'Title',
          'author' =>'Author(s)',
          'authorspace' => 'Author Space',
          'modifyinguser' => 'Last Modifying User',
@@ -251,21 +248,6 @@ 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,
@@ -1043,40 +1025,21 @@ ENDEDIT
                 $Apache::lonpublisher::metadatafields{'copyright'}=
                     'default';
             }
-            $output.=('<p>'.$lt{$_}.': '.
-                      &prettyinput($_,
+            if ($env{'form.metacourse'}) {
+                # handle restrictions here
+                $env{'form.metacourse'} =~ m/(^.+)\.description$/;
+                my $key_base = $1;
+                if ($env{$key_base.'.metadata.'.$_.'.options'} =~ m/active/) {
+                    $output.=('<p>'.$lt{$_}.': '.
+                            &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';
+            } else {
+                $output.=('<p>'.$lt{$_}.': '.
+                            &prettyinput($_,
+				   $Apache::lonpublisher::metadatafields{$_},
+				   'new_'.$_,'defaultmeta').'</p>');
             }
         }
         if ($env{'form.store'}) {
@@ -1084,9 +1047,6 @@ ENDEDIT
             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'));
@@ -1121,7 +1081,6 @@ ENDEDIT
                 $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').', '.