--- loncom/interface/lonmeta.pm	2006/10/16 21:39:37	1.183
+++ loncom/interface/lonmeta.pm	2006/10/23 21:09:21	1.185
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.183 2006/10/16 21:39:37 albertel Exp $
+# $Id: lonmeta.pm,v 1.185 2006/10/23 21:09:21 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1192,24 +1192,28 @@ ENDEDIT
 	my $output;
 	my @fields;
 	my $added_metadata_fields;
+	my @added_order;
 	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'});
+	        @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);
+	        if ($env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'}) {
+	            @added_order = split(/,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'});
+	        }
+	        $env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.fieldlist'} = join(",",@fields);
 	    }
 	} else {
 	    @fields = ('author','title','subject','keywords','abstract','notes',
-                 'copyright','customdistributionfile','language',
-                 'standards',
-                 'lowestgradelevel','highestgradelevel','sourceavail','sourcerights',
-                 'obsolete','obsoletereplacement');
+		       'copyright','customdistributionfile','language',
+		       'standards',
+		       'lowestgradelevel','highestgradelevel','sourceavail','sourcerights',
+		       'obsolete','obsoletereplacement');
         }
         if ($file_type eq 'groups') {
             $Apache::lonpublisher::metadatafields{'courserestricted'}=
@@ -1244,10 +1248,16 @@ ENDEDIT
 		$r->print("This resource is not associated with a course.<br />");
 	    }
 	}
-        foreach my $field_name(keys (%$added_metadata_fields)) {
-            
-            push (@fields,$field_name);
-            $lt{$field_name} = $$added_metadata_fields{$field_name};
+	if (@added_order) {
+	    foreach my $field_name (@added_order) {
+                push(@fields,$field_name);
+                $lt{$field_name} = $$added_metadata_fields{$field_name};
+	    }
+	} else {
+            foreach my $field_name (keys(%$added_metadata_fields)) {
+                push(@fields,$field_name);
+                $lt{$field_name} = $$added_metadata_fields{$field_name};
+            }
         }
         foreach my $field_name (@fields) {
             if (defined($env{'form.new_'.$field_name})) {
@@ -1270,9 +1280,9 @@ ENDEDIT
             } else {
 
                     $output.=('<p>'.$lt{$field_name}.': '.
-                            &prettyinput($field_name,
-				   $Apache::lonpublisher::metadatafields{$field_name},
-				   'new_'.$field_name,'defaultmeta').'</p>');
+			      &prettyinput($field_name,
+					   $Apache::lonpublisher::metadatafields{$field_name},
+					   'new_'.$field_name,'defaultmeta').'</p>');
                
             }
         }
@@ -1284,7 +1294,7 @@ ENDEDIT
 		$Apache::lonpublisher::metadatafields{'keywords'} = 
 		    join (',', &Apache::loncommon::get_env_multiple('form.new_keywords'));
 	    }
-	    foreach my $field (sort keys %Apache::lonpublisher::metadatafields) {
+	    foreach my $field (sort(keys(%Apache::lonpublisher::metadatafields))) {
 		next if ($field =~ /\./);
 		my $unikey=$field;
 		$unikey=~/^([A-Za-z_]+)/;
@@ -1292,8 +1302,8 @@ ENDEDIT
 		$tag=~tr/A-Z/a-z/;
 		$file_content.= "\n\<$tag";
 		foreach my $key (split(/\,/,
-			       $Apache::lonpublisher::metadatakeys{$unikey})
-			 ) {
+				       $Apache::lonpublisher::metadatakeys{$unikey})
+				 ) {
 		    my $value=
 			$Apache::lonpublisher::metadatafields{$unikey.'.'.$key};
 		    $value=~s/\"/\'\'/g;
@@ -1315,12 +1325,12 @@ ENDEDIT
                 $r->print(&store_portfolio_metadata($formname,$file_content,$path,
                                                     $new_fn));
             } else {
-		if (!  ($mfh=Apache::File->new('>'.$fn))) {
+		if (! ($mfh=Apache::File->new('>'.$fn))) {
 		    $r->print('<p><font color="red">'.
 			      &mt('Could not write metadata').', '.
 			      &mt('FAIL').'</font></p>');
 		} else {
-		    print $mfh $file_content;
+		    print $mfh ($file_content);
 		    $r->print('<p><font color="blue">'.&mt('Wrote Metadata').
 			      ' '.&Apache::lonlocal::locallocaltime(time).
 			      '</font></p>');