--- loncom/interface/lonmeta.pm	2006/08/28 00:19:38	1.168.2.3
+++ loncom/interface/lonmeta.pm	2006/09/25 19:24:49	1.178
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.168.2.3 2006/08/28 00:19:38 albertel Exp $
+# $Id: lonmeta.pm,v 1.178 2006/09/25 19:24:49 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -237,12 +237,6 @@ sub fieldnames {
     
     if (! defined($file_type) || $file_type ne 'portfolio') {
         %fields = 
-	    (%fields,
-	     'courserestricted' => 'Course Restricting Metadata');
-    }
-         
-    if (! defined($file_type) || $file_type ne 'portfolio') {
-        %fields = 
         (%fields,
          'domain' => 'Domain',
          'mime' => 'MIME Type',
@@ -366,6 +360,8 @@ sub pre_select_course {
     $output = &select_course();
     $r->print($output.'<br /><input type="submit" name="store" value="'.
                   &mt('Associate Resource With Selected Course').'" />');
+    $r->print('<input type="hidden" name="currentpath" value="'.$env{'form.currentpath'}.'" />');
+    $r->print('<input type="hidden" name="associate" value="true" />');
     $r->print('</form>');
     
     my ($port_path,$group) = &get_port_path_and_group($uri);
@@ -605,9 +601,11 @@ sub prettyinput {
             return (&select_course());
             # return ('<input type="hidden" name="new_courserestricted" value="'.$course_key.'" />');
         }
+        my $course = $env{'request.course.id'};
         if (($type eq 'keywords') || ($type eq 'subject')
              || ($type eq 'author')||($type eq  'notes')
-             || ($type eq  'abstract')|| ($type eq  'title')|| ($type eq  'standards')) {
+             || ($type eq  'abstract')|| ($type eq  'title')|| ($type eq  'standards')
+             || (exists($env{'course.'.$env{'request.course.id'}.'.metadata.'.$type.'.added'}))) {
             if ($values) {
                 if ($only_one) {
                     $output .= (&Apache::loncommon::select_form($cur_values_inst[0],'new_'.$type,%meta_options));
@@ -622,7 +620,7 @@ sub prettyinput {
                       $relatedvalue); 
             }
             return ($output);
-        }
+        } 
         if (($type eq 'lowestgradelevel') ||
 	    ($type eq 'highestgradelevel')) {
 	    return &Apache::loncommon::select_level_form($value,$fieldname).
@@ -717,7 +715,8 @@ sub prettyinput {
 # Main Handler
 sub handler {
     my $r=shift;
-    #
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+         ['currentpath']);
     my $uri=$r->uri;
     #
     # Set document type
@@ -745,7 +744,6 @@ sub handler {
         $r->print(&Apache::loncommon::start_page('Edit Group Portfolio File Catalog Information',
 						 undef,
 						 {'domain' => $resdomain,}));
-						 
         &present_editable_metadata($r,$uri,'groups');    
     } elsif ($uri=~m|^/~|) { 
         # Construction space
@@ -1148,7 +1146,7 @@ sub present_editable_metadata {
 	my $goback=&mt('Back to Source File');
         $r->print(<<ENDBOMBS);
 <h1>$disuri</h1>
-<form method="post" name="defaultmeta">
+<form method="post" action="" name="defaultmeta">
 ENDBOMBS
         if ($showdel) {
 	    $r->print(<<ENDDEL);
@@ -1178,18 +1176,28 @@ ENDDEL
         }
         $r->print(<<ENDEDIT);
 <h1>$displayfile</h1>
-<form method="post" name="defaultmeta">
+<form method="post" action="" name="defaultmeta">
 ENDEDIT
-        $r->print('<script language="JavaScript">'.
+        $r->print('<script type="JavaScript">'.
                   &Apache::loncommon::browser_and_searcher_javascript().
                   '</script>');
         my %lt=&fieldnames($file_type);
 	my $output;
 	my @fields;
-	if ($file_type eq 'portfolio') {
-	    @fields =  ('author','title','subject','keywords','abstract',
-			'notes','lowestgradelevel',
-	                'highestgradelevel','standards');
+	my $added_metadata_fields;
+	if ($file_type eq 'portfolio' || $file_type eq 'groups') {
+	    if(exists ($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.fieldlist'})) {
+	        # retrieve fieldnames (in order) from the course restricted list
+	        @fields = (split /,/,$env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.fieldlist'});
+	    } else {
+	        # no saved field list, use default list
+	        @fields =  ('author','title','subject','keywords','abstract',
+			    'notes','lowestgradelevel',
+	                    'highestgradelevel','standards');
+	        $added_metadata_fields = &Apache::lonparmset::get_added_meta_fieldnames();
+	        
+	        $env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.fieldlist'} = join (",",@fields);
+	    }
 	} else {
 	    @fields = ('author','title','subject','keywords','abstract','notes',
                  'copyright','customdistributionfile','language',
@@ -1230,8 +1238,13 @@ ENDEDIT
 		$r->print("This resource is not associated with a course.<br />");
 	    }
 	}
+        foreach my $field_name(keys (%$added_metadata_fields)) {
+            push (@fields,$field_name);
+            $Apache::lonpublisher::metadatafields{$field_name} =
+                     $$added_metadata_fields{$field_name};
+            $lt{$field_name} = $$added_metadata_fields{$field_name};
+        }
         foreach my $field_name (@fields) {
-
             if (defined($env{'form.new_'.$field_name})) {
                 $Apache::lonpublisher::metadatafields{$field_name}=
                     join(',',&Apache::loncommon::get_env_multiple('form.new_'.$field_name));
@@ -1265,22 +1278,20 @@ ENDEDIT
 		$Apache::lonpublisher::metadatafields{'keywords'} = 
 		    join (',', &Apache::loncommon::get_env_multiple('form.new_keywords'));
 	    }
-
-	    foreach (sort keys %Apache::lonpublisher::metadatafields) {
-		next if ($_ =~ /\./);
-		my $unikey=$_;
-		$unikey=~/^([A-Za-z]+)/;
+	    foreach my $field (sort keys %Apache::lonpublisher::metadatafields) {
+		next if ($field =~ /\./);
+		my $unikey=$field;
+		$unikey=~/^([A-Za-z_]+)/;
 		my $tag=$1;
 		$tag=~tr/A-Z/a-z/;
 		$file_content.= "\n\<$tag";
-		foreach (split(/\,/,
+		foreach my $key (split(/\,/,
 			       $Apache::lonpublisher::metadatakeys{$unikey})
 			 ) {
 		    my $value=
-			$Apache::lonpublisher::metadatafields{$unikey.'.'.$_};
+			$Apache::lonpublisher::metadatafields{$unikey.'.'.$key};
 		    $value=~s/\"/\'\'/g;
-		    $file_content.=' '.$_.'="'.$value.'"' ;
-		    # print $mfh ' '.$_.'="'.$value.'"';
+		    $file_content.=' '.$key.'="'.$value.'"' ;
 		}
 		$file_content.= '>'.
 		    &HTML::Entities::encode
@@ -1296,7 +1307,7 @@ ENDEDIT
 		    ($path, $new_fn) = ($fn =~ m|/(portfolio.*)/([^/]*)$|);
 	        }
                 $r->print(&store_portfolio_metadata($formname,$file_content,$path,
-                                                    $new_fn));    
+                                                    $new_fn));
             } else {
 		if (!  ($mfh=Apache::File->new('>'.$fn))) {
 		    $r->print('<p><font color="red">'.
@@ -1310,20 +1321,21 @@ ENDEDIT
 		}
 	    }
 	}
-	
 	$r->print($output.'<br /><input type="submit" name="store" value="'.
-                  &mt('Store Catalog Information').'">');
+                  &mt('Store Catalog Information').'" />');
 
 	if ($file_type eq 'portfolio') {
 	    my ($port_path,$group) = &get_port_path_and_group($uri);
             if ($group) {
                 $r->print('<input type="hidden" name="group" value="'.$group.'" />');
             }
-	    $r->print('</form>
-               <br /><br /><form method="POST" action="'.$port_path.'">'.
-		      '<input type="hidden" name="group" value="'.$group.'" />'.
-		      '<input type="hidden" name="currentpath" value="'.$path.'" />'.
-		      '<input type="submit" name="cancel" value="'.&mt('Discard Edits and Return to Portfolio').'">');
+            $r->print('<input type="hidden" name="currentpath" value="'.$env{'form.currentpath'}.'" />');
+	    $r->print('</form><br /><br /><form method="post" action="'.$port_path.'">');
+	    if ($group) {
+	        $r->print('<input type="hidden" name="group" value="'.$group.'" />');
+	    }
+	    $r->print('<input type="hidden" name="currentpath" value="'.$path.'" />'.
+		      '<input type="submit" name="cancel" value="'.&mt('Discard Edits and Return to Portfolio').'" />');
 	}
     }