--- loncom/interface/lonparmset.pm	2006/09/25 19:29:56	1.336
+++ loncom/interface/lonparmset.pm	2006/10/07 20:02:16	1.339
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.336 2006/09/25 19:29:56 albertel Exp $
+# $Id: lonparmset.pm,v 1.339 2006/10/07 20:02:16 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3188,25 +3188,30 @@ ENDMAINFORMHEAD
 }
 ### Set portfolio metadata
 sub output_row {
-    my ($r, $field_name, $field_text) = @_;
+    my ($r, $field_name, $field_text, $added_flag) = @_;
     my $output;
     my $options=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.options'};
     my $values=$env{'course.'.$env{'request.course.id'}.'.metadata.'.$field_name.'.values'};
-    unless (defined($options)) {
+    if (!defined($options)) {
         $options = 'active,stuadd';
         $values = '';
     }
-    $output.='<strong>'.$field_text.':</strong>';
-    $output.='<input name="'.$field_name.'_values" type="text" value="'.$values.'" size="80" /><br />';
+    if (!($options =~ /deleted/)) {
+        $output.='<strong>'.$field_text.':</strong>';
+        $output.='<input name="'.$field_name.'_values" type="text" value="'.$values.'" size="80" /><br />';
 
-    my @options= ( ['active', 'Show to student'],
+        my @options= ( ['active', 'Show to student'],
 		   ['onlyone','Student may select only one choice'],
 		   ['stuadd', 'Student may type choices']);
-    foreach my $opt (@options) {
-	my $checked = ($options =~ m/$opt->[0]/) ? ' checked="checked" ' : '' ;
-	$output.=('&nbsp;'x5).'<label><input type="checkbox" name="'.
-	    $field_name.'_'.$opt->[0].'" value="yes"'.$checked.' />'.
-	    &mt($opt->[1]).'</label> <br />';
+        if ($added_flag) {
+            push @options,['deleted', 'Delete Metadata Field'];
+        }
+        foreach my $opt (@options) {
+	    my $checked = ($options =~ m/$opt->[0]/) ? ' checked="checked" ' : '' ;
+	    $output.=('&nbsp;'x5).'<label><input type="checkbox" name="'.
+	        $field_name.'_'.$opt->[0].'" value="yes"'.$checked.' />'.
+	        &mt($opt->[1]).'</label> <br />';
+	}
     }
     return ($output);
 }
@@ -3216,17 +3221,42 @@ sub addmetafield {
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Add Metadata Field'));
     my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
-    if (exists($env{'form.fieldname'})) {
+    if (exists($env{'form.undelete'})) {
+        my @meta_fields = &Apache::loncommon::get_env_multiple('form.undelete');
+        foreach my $meta_field(@meta_fields) {
+            my $options = $env{'course.'.$env{'request.course.id'}.'.metadata.'.$meta_field.'.options'};
+            $options =~ s/deleted//;
+            $options =~ s/,,/,/;
+            my $put_result = &Apache::lonnet::put('environment',
+                                        {'metadata.'.$meta_field.'.options'=>$options},$dom,$crs);
+                                        
+            $r->print('Undeleted Metadata Field <strong>'.$env{'course.'.$env{'request.course.id'}.'.metadata.'.$meta_field.'.added'}."</strong> with result ".$put_result.'<br />');
+        }
+        $r->print('<form action="" method="post">');
+        $r->print('<input type="hidden" name="action" value="setrestrictmeta" />');
+        $r->print('<input type="submit" value="Continue" />');
+    } elsif (exists($env{'form.fieldname'})) {
         my $meta_field = $env{'form.fieldname'};
         my $display_field = $env{'form.fieldname'};
         $meta_field =~ s/\W/_/g;
+        $meta_field =~ tr/A-Z/a-z/;
         my $put_result = &Apache::lonnet::put('environment',
                             {'metadata.'.$meta_field.'.values'=>"",
                              'metadata.'.$meta_field.'.added'=>"$display_field",
                              'metadata.'.$meta_field.'.options'=>""},$dom,$crs);
         $r->print('Added new Metadata Field '.$env{'form.fieldname'}." with result ".$put_result);
     } else {
-        $r->print('<form method="post" action="/adm/parmset?action=addmetadata"');
+        my $fields = &get_deleted_meta_fieldnames();
+        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="">');
+            foreach my $key(keys(%$fields)) {
+                $r->print('<input type="checkbox" name="undelete" value="'.$key.'" />'.$$fields{$key}.'<br /');
+            }
+            $r->print('<input type="submit" name="undelete" value="Undelete" />');
+            $r->print('</form>');
+        }
+        $r->print('<hr /><strong>Or</strong> you may enter a new metadata field name.<form method="post" action="/adm/parmset?action=addmetadata"');
         $r->print('<input type="text" name="fieldname" /><br />');
         $r->print('<input type="submit" value="Add Metadata Field" />');
         $r->print('</form>');
@@ -3261,6 +3291,10 @@ sub setrestrictmeta {
             	    if ($env{'form.'.$meta_field.'_active'}) {
             	        $options.='active,';
             	    }
+            	    if ($env{'form.'.$meta_field.'_deleted'}) {
+            	        $options.='deleted,';
+            	    }
+            	    
                     my $name = $save_field;
                      $put_result = &Apache::lonnet::put('environment',
                                                   {'metadata.'.$meta_field.'.options'=>$options,
@@ -3281,8 +3315,9 @@ sub setrestrictmeta {
 	    $output.= &output_row($r, $field, $metadata_fields{$field});
 	}
     }
+    my $added_flag = 1;
     foreach my $field (sort(keys(%$added_metadata_fields))) {
-        $output.= &output_row($r, $field, $$added_metadata_fields{$field});
+        $output.= &output_row($r, $field, $$added_metadata_fields{$field},$added_flag);
     }
     $r->print(<<ENDenv);       
         <form method="post" action="/adm/parmset?action=setrestrictmeta" name="form">
@@ -3309,6 +3344,20 @@ sub get_added_meta_fieldnames {
         }
     }
     return \%fields;
+}
+sub get_deleted_meta_fieldnames {
+    my %fields;
+    my ($default_fields) = @_;
+    foreach my $key(%env) {
+        if ($key =~ m/\.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};
+                $fields{$field_name} = $display_field_name;
+            }
+        }
+    }
+    return \%fields;
 }
 sub defaultsetter {
     my ($r) = @_;