--- loncom/interface/lonparmset.pm	2007/01/04 19:34:13	1.356
+++ loncom/interface/lonparmset.pm	2007/01/12 20:04:16	1.357
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.356 2007/01/04 19:34:13 albertel Exp $
+# $Id: lonparmset.pm,v 1.357 2007/01/12 20:04:16 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3288,7 +3288,7 @@ sub order_meta_fields {
                            {'metadata.addedorder'=>$ordered_fields},$dom,$crs); 	
 	&Apache::lonnet::appenv('course.'.$env{'request.course.id'}.'.metadata.addedorder' => $ordered_fields);
     }
-    my $fields = &get_added_meta_fieldnames();
+    my $fields = &get_added_meta_fieldnames($env{'request.course.id'});
     my $ordered_fields;
     my @fields_in_order = split /,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'};
     if (!@fields_in_order) {
@@ -3354,7 +3354,7 @@ sub addmetafield {
                              'metadata.'.$meta_field.'.options'=>""},$dom,$crs);
         $r->print('Added new Metadata Field '.$env{'form.fieldname'}." with result ".$put_result);
     } else {
-        my $fields = &get_deleted_meta_fieldnames();
+        my $fields = &get_deleted_meta_fieldnames($env{'request.course.id'});
         if ($fields) {
             $r->print('You may undelete previously deleted fields.<br />Check those you wish to undelete and click Undelete.<br />');
             $r->print('<form method="post" action="">');
@@ -3419,7 +3419,7 @@ sub setrestrictmeta {
     # Get the default metadata fields
     my %metadata_fields = &Apache::lonmeta::fieldnames('portfolio');
     # Now get possible added metadata fields
-    my $added_metadata_fields = &get_added_meta_fieldnames(\%metadata_fields);
+    my $added_metadata_fields = &get_added_meta_fieldnames($env{'request.course.id'});
     my $row_alt = 1;
     $output .= &Apache::loncommon::start_data_table();
     foreach my $field (sort(keys(%metadata_fields))) {
@@ -3455,9 +3455,10 @@ ENDenv
 }
 ##################################################
 sub get_added_meta_fieldnames {
+    my ($cid) = @_;
     my %fields;
     foreach my $key(%env) {
-        if ($key =~ m/\.metadata\.(.+)\.added$/) {
+        if ($key =~ m/\Q$cid\E\.metadata\.(.+)\.added$/) {
             my $field_name = $1;
             my ($display_field_name) = $env{$key};
             $fields{$field_name} = $display_field_name;
@@ -3466,10 +3467,10 @@ sub get_added_meta_fieldnames {
     return \%fields;
 }
 sub get_deleted_meta_fieldnames {
+    my ($cid) = @_;
     my %fields;
-    my ($default_fields) = @_;
     foreach my $key(%env) {
-        if ($key =~ m/\.metadata\.(.+)\.added$/) {
+        if ($key =~ m/\Q$cid\E\.metadata\.(.+)\.added$/) {
             my $field_name = $1;
             if ($env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.options'} =~ m/deleted/) {
                 my ($display_field_name) = $env{$key};