--- loncom/interface/lonmeta.pm	2006/08/10 21:14:10	1.167
+++ loncom/interface/lonmeta.pm	2008/11/10 15:15:29	1.213
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.167 2006/08/10 21:14:10 banghart Exp $
+# $Id: lonmeta.pm,v 1.213 2008/11/10 15:15:29 jms Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,6 +26,141 @@
 # http://www.lon-capa.org/
 
 
+=head1 NAME
+
+Apache::lonmeta - display meta data
+
+=head1 SYNOPSIS
+
+Handler to display meta data
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 HANDLER SUBROUTINE
+
+handler()
+
+=head1 OTHER SUBROUTINES
+
+=over
+
+=item *
+
+&get_dynamic_metadata_from_sql($url) :
+
+Queries sql database for dynamic metdata
+Returns a hash of hashes, with keys of urls which match $url
+Returned fields are given below.
+
+Examples:
+
+    %DynamicMetadata = &Apache::lonmeta::get_dynmaic_metadata_from_sql
+    ('/res/msu/korte/');
+
+    $DynamicMetadata{'/res/msu/korte/example.problem'}->{$field}
+
+=item *
+
+dynamicmeta() : Fetch and evaluate dynamic metadata
+
+=item *
+
+access_count()
+
+=item *
+
+alttag() : Try to make an alt tag if there is none
+
+=item *
+
+authordisplay() : Author display
+
+=item *
+
+evalgraph() : Pretty display
+
+=item *
+
+diffgraph()
+
+=item *
+
+fieldnames()
+
+=item *
+
+portfolio_linked_path()
+
+=item *
+
+get_port_path_and_group()
+
+=item *
+
+portfolio_display_uri()
+
+=item *
+
+pre_select_course()
+
+=item *
+
+select_course()
+
+=item *
+
+prettyprint() : Pretty printing of metadata field
+
+=item *
+
+direct() : Pretty input of metadata field
+
+=item *
+
+selectbox()
+
+=item *
+
+relatedfield()
+
+=item *
+
+prettyinput()
+
+=item *
+
+report_bombs()
+
+=item *
+
+present_uneditable_metadata()
+
+=item *
+
+present_editable_metadata()
+
+=item *
+
+store_metadata()
+
+=item *
+
+store_transferred_addedfields()
+
+=item *
+
+store_portfolio_metadata()
+
+=item *
+
+update_metadata_table()
+
+=back
+
+=cut
+
+
 package Apache::lonmeta;
 
 use strict;
@@ -39,31 +174,12 @@ use Apache::lonpublisher;
 use Apache::lonlocal;
 use Apache::lonmysql;
 use Apache::lonmsg;
-use lib '/home/httpd/lib/perl/';
-use LONCAPA;
+use LONCAPA qw(:DEFAULT :match);
 
 
-############################################################
-############################################################
-##
-## &get_dynamic_metadata_from_sql($url)
-## 
-## Queries sql database for dynamic metdata
-## Returns a hash of hashes, with keys of urls which match $url
-## Returned fields are given below.
-##
-## Examples:
-## 
-## %DynamicMetadata = &Apache::lonmeta::get_dynmaic_metadata_from_sql
-##     ('/res/msu/korte/');
-##
-## $DynamicMetadata{'/res/msu/korte/example.problem'}->{$field}
-##
-############################################################
-############################################################
 sub get_dynamic_metadata_from_sql {
     my ($url) = shift();
-    my ($authordom,$author)=($url=~m:^/res/(\w+)/(\w+)/:);
+    my ($authordom,$author)=($url=~m{^/res/($match_domain)/($match_username)/});
     if (! defined($authordom)) {
         $authordom = shift();
     }
@@ -95,7 +211,8 @@ sub get_dynamic_metadata_from_sql {
         while (my $result = <$fh>) {
             chomp($result);
             next if (! $result);
-            my %hash=&LONCAPA::lonmetadata::metadata_col_to_hash(map { &unescape($_) } split(/\,/,$result));
+            my %hash=&LONCAPA::lonmetadata::metadata_col_to_hash('metadata',
+								 map { &unescape($_) } split(/\,/,$result));
             foreach my $key (keys(%hash)) {
                 $ReturnHash{$hash{'url'}}->{$key}=$hash{$key};
             }
@@ -111,7 +228,7 @@ sub get_dynamic_metadata_from_sql {
 sub dynamicmeta {
     my $url=&Apache::lonnet::declutter(shift);
     $url=~s/\.meta$//;
-    my ($adomain,$aauthor)=($url=~/^(\w+)\/(\w+)\//);
+    my ($adomain,$aauthor)=($url=~/^($match_domain)\/($match_username)\//);
     my $regexp=$url;
     $regexp=~s/(\W)/\\$1/g;
     $regexp='___'.$regexp.'___';
@@ -235,13 +352,7 @@ sub fieldnames {
          'lowestgradelevel' => 'Lowest Grade Level',
          'highestgradelevel' => 'Highest Grade Level');
     
-    if (! defined($file_type) || $file_type ne 'portfolio') {
-        %fields = 
-	    (%fields,
-	     'courserestricted' => 'Course Restricting Metadata');
-    }
-         
-    if (! defined($file_type) || $file_type ne 'portfolio') {
+    if ( !defined($file_type) || ($file_type ne 'portfolio' && $file_type ne 'groups') ) {
         %fields = 
         (%fields,
          'domain' => 'Domain',
@@ -271,7 +382,7 @@ sub fieldnames {
          'correct'    => 'Material appears to be correct',
          'technical'  => 'Resource is technically correct', 
          'avetries'   => 'Average number of tries till solved',
-         'stdno'      => 'Total number of students who have worked on this problem',
+         'stdno'      => 'Statistics calculated for number of students',
          'difficulty' => 'Degree of difficulty',
          'disc'       => 'Degree of discrimination',
 	     'dependencies' => 'Resources used by this resource',
@@ -366,15 +477,15 @@ 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);
     my $group_input;
     if ($group) {
-        $group_input = '<input type="hidden" name="group" value="'.$group.'" />'
-    } else {
-        $group_input = "";
-    }
+        $group_input = '<input type="hidden" name="group" value="'.$group.'" />';
+    } 
     $r->print('<br /><br /><form method="post" action="'.$port_path.'">'.
               '<input type="hidden" name="currentpath" value="'.$path.'" />'.
 	      $group_input.
@@ -389,7 +500,40 @@ sub select_course {
 	$Apache::lonpublisher::metadatafields{'courserestricted'};
     my $selected = ($current_restriction eq 'none' ? 'selected="selected"' 
 		                                   : '');
-
+    if ($current_restriction =~ /^course\.($match_domain\_$match_courseid)$/) {
+        my $assoc_crs = $1;
+        my $added_metadata_fields = &Apache::lonparmset::get_added_meta_fieldnames($assoc_crs);
+        if (ref($added_metadata_fields) eq 'HASH') {
+            if (keys(%{$added_metadata_fields}) > 0) {
+                my $transfernotes;
+                foreach my $field_name (keys(%{$added_metadata_fields})) {
+                    my $value = $Apache::lonpublisher::metadatafields{$field_name};
+                    if ($value) {
+                        $transfernotes .= 
+                            &Apache::loncommon::start_data_table_row(). 
+                            '<td><input type="checkbox" name="transfer_'.
+                            $field_name.'" value="1" /></td><td>'.
+                            $field_name.'</td><td>'.$value.'</td>'.
+                            &Apache::loncommon::end_data_table_row();
+                    }
+                }
+                if ($transfernotes ne '') {
+                    my %courseinfo = &Apache::lonnet::coursedescription($assoc_crs,{'one_time' => 1});
+                    my $assoc_crs_description = $courseinfo{'description'};
+                    $output .= &mt('This resource is currently associated with a course ([_1]) which includes added metadata fields specific to the course.',$assoc_crs_description).'<br />'."\n".
+                    &mt('You can choose to transfer data from the added fields to the "Notes" field if you are planning to change the course association.').'<br /><br />'.
+                    &Apache::loncommon::start_data_table().
+                    &Apache::loncommon::start_data_table_header_row().
+                    '<th>Copy to notes?</th>'."\n".
+                    '<th>Field name</th>'."\n".
+                    '<th>Values</th>'."\n".
+                    &Apache::loncommon::end_data_table_header_row().
+                    $transfernotes.
+                    &Apache::loncommon::end_data_table().'<br />';
+                }
+            }
+        }
+    }
     $output .= '<select name="new_courserestricted" >';
     $output .= '<option value="none" '.$selected.'>'.
 	&mt('None').'</option>'.$/;
@@ -454,7 +598,7 @@ sub prettyprint {
 	($type eq 'owner') ||
 	($type eq 'modifyinguser') ||
 	($type eq 'authorspace')) {
-	$value=~s/(\w+)(\:|\@)(\w+)/&authordisplay($1,$3)/gse;
+	$value=~s/($match_username)(\:|\@)($match_domain)/&authordisplay($1,$3)/gse;
 	return $value;
     }
     # Gradelevel
@@ -474,7 +618,7 @@ sub prettyprint {
 	($type eq 'sequsage_list') ||
 	($type eq 'dependencies')) {
 	return '<font size="-1"><ul>'.join("\n",map {
-            my $url = &Apache::lonnet::clutter($_);
+            my $url = &Apache::lonnet::clutter_with_no_wrapper($_);
             my $title = &Apache::lonnet::gettitle($url);
             if ($title eq '') {
                 $title = 'Untitled';
@@ -511,6 +655,7 @@ sub prettyprint {
     if ($type=~/\_list/) {
         my @Courses = split(/\s*\,\s*/,$value);
         my $Str='<font size="-1"><ul>';
+	my %descriptions;
         foreach my $course (@Courses) {
             my %courseinfo =
 		&Apache::lonnet::coursedescription($course,
@@ -518,10 +663,16 @@ sub prettyprint {
             if (! exists($courseinfo{'num'}) || $courseinfo{'num'} eq '') {
                 next;
             }
-            $Str .= '<li><a href="/public/'.$courseinfo{'domain'}.'/'.
+	    $descriptions{join('\0',@courseinfo{'domain','description'})} .= 
+		'<li><a href="/public/'.$courseinfo{'domain'}.'/'.
                 $courseinfo{'num'}.'/syllabus" target="preview">'.
-                $courseinfo{'description'}.'</a></li>';
+                $courseinfo{'description'}.' ('.$courseinfo{'domain'}.
+		')</a></li>';
         }
+	foreach my $course (sort {lc($a) cmp lc($b)} (keys(%descriptions))) {
+	    $Str .= $descriptions{$course};
+	}
+
 	return $Str.'</ul></font>';
     }
     # No pretty print found
@@ -597,9 +748,16 @@ sub prettyinput {
                 if ($meta_options{$item}) {
                     push(@cur_values_inst,$item);
                 } else {
-                    $cur_values_stu .= $item.',';
+                    if ($item ne '') {
+                        $cur_values_stu .= $item.',';
+                    }
                 }
             }
+             $cur_values_stu =~ s/,$//;
+            my @key_order = sort(keys(%meta_options));
+            unshift(@key_order,'');
+            $meta_options{''} = 'Not specified';
+            $meta_options{'select_form_order'} = \@key_order;
         } else {
             $cur_values_stu = $value;
         }
@@ -609,7 +767,9 @@ sub prettyinput {
         }
         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_key.'.metadata.'.$type.'.added'}))) {
+            
             if ($values) {
                 if ($only_one) {
                     $output .= (&Apache::loncommon::select_form($cur_values_inst[0],'new_'.$type,%meta_options));
@@ -624,7 +784,7 @@ sub prettyinput {
                       $relatedvalue); 
             }
             return ($output);
-        }
+        } 
         if (($type eq 'lowestgradelevel') ||
 	    ($type eq 'highestgradelevel')) {
 	    return &Apache::loncommon::select_level_form($value,$fieldname).
@@ -719,35 +879,52 @@ sub prettyinput {
 # Main Handler
 sub handler {
     my $r=shift;
-    #
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+         ['currentpath','changecourse']);
     my $uri=$r->uri;
     #
     # Set document type
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     return OK if $r->header_only;
-    #
     my ($resdomain,$resuser)=
-        (&Apache::lonnet::declutter($uri)=~/^(\w+)\/(\w+)\//);
+        (&Apache::lonnet::declutter($uri)=~/^($match_domain)\/($match_username)\//);
     if ($uri=~m:/adm/bombs/(.*)$:) {
         $r->print(&Apache::loncommon::start_page('Error Messages'));
         # Looking for all bombs?
         &report_bombs($r,$uri);
     } elsif ($uri=~m|^/editupload/[^/]+/[^/]+/portfolio/|) {
 	    ($resdomain,$resuser)=
-		(&Apache::lonnet::declutter($uri)=~m|^(\w+)/(\w+)/portfolio|);
+		(&Apache::lonnet::declutter($uri)=~m|^($match_domain)/($match_name)/portfolio|);
         $r->print(&Apache::loncommon::start_page('Edit Portfolio File Catalog Information',
 						 undef,
 						 {'domain' => $resdomain,}));
         if ($env{'form.store'}) {
             &present_editable_metadata($r,$uri,'portfolio');
         } else {
-            &pre_select_course($r,$uri);
+            my $fn=&Apache::lonnet::filelocation('',$uri);
+            %Apache::lonpublisher::metadatafields=();
+            %Apache::lonpublisher::metadatakeys=();
+            my $result=&Apache::lonnet::getfile($fn);
+            &Apache::lonpublisher::metaeval($result);
+            if ((!$Apache::lonpublisher::metadatafields{'courserestricted'}) ||
+                ($env{'form.changecourse'} eq 'true')) {
+                &pre_select_course($r,$uri);
+            } else {
+                &present_editable_metadata($r,$uri,'portfolio');
+            }
         }
+    } elsif ($uri=~m|^/editupload/[^/]+/[^/]+/groups/|) {
+        $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
-        $r->print(&Apache::loncommon::start_page('Edit Catalog nformation',
-						 undef,
+        $r->print(&Apache::loncommon::start_page('Edit Catalog Information',
+						"\n".'<script type="text/javascript">'."\n".
+                                                &Apache::loncommon::browser_and_searcher_javascript().
+                                                "\n".'</script>',
 						 {'domain' => $resdomain,}));
         &present_editable_metadata($r,$uri);
     } else {
@@ -773,16 +950,20 @@ sub report_bombs {
     $uri =~ s:/adm/bombs/::;
     $uri = &Apache::lonnet::declutter($uri);
     $r->print('<h1>'.&Apache::lonnet::clutter($uri).'</h1>');
-    my ($domain,$author)=($uri=~/^(\w+)\/(\w+)\//);
+    my ($domain,$author)=($uri=~/^($match_domain)\/($match_username)\//);
     if (&Apache::loncacc::constructaccess('/~'.$author.'/',$domain)) {
 	if ($env{'form.clearbombs'}) {
 	    &Apache::lonmsg::clear_author_res_msg($uri);
 	}
         my $clear=&mt('Clear all Messages in Subdirectory');
-	$r->print(<<ENDCLEAR);
+        my $cancel=&mt('Back to Directory');
+        my $cancelurl=$uri;
+        $cancelurl=~s/^\Q$domain\E/\/priv/;
+        $r->print(<<ENDCLEAR);
 <form method="post">
 <input type="submit" name="clearbombs" value="$clear" />
-</form>
+<a href="$cancelurl">$cancel</a>
+</form><hr />
 ENDCLEAR
         my %brokenurls = 
             &Apache::lonmsg::all_url_author_res_msg($author,$domain);
@@ -820,8 +1001,7 @@ sub present_uneditable_metadata {
     # displayed url
     my ($thisversion)=($uri=~/\.(\d+)\.(\w+)\.meta$/);
     $uri=~s/\.meta$//;
-    my $disuri=&Apache::lonnet::clutter($uri);
-    $disuri=~s/^\/adm\/wrapper//;
+    my $disuri=&Apache::lonnet::clutter_with_no_wrapper($uri);
     # version
     my $versiondisplay='';
     if (!$uploaded) {
@@ -967,17 +1147,17 @@ sub print_dynamic_metadata {
             #
             # New assessment statistics
             $r->print('<h4>'.
-                      &mt('Detailed Assessment Statistical Data').
+                      &mt('Recent Detailed Assessment Statistical Data').
                       '</h4>');
             my $table = '<table cellspacing="2" border="0">'.
                 '<tr>'.
-                '<th>Course</th>'.
-                '<th>Section(s)</th>'.
-                '<th>Num Students</th>'.
-                '<th>Mean Tries</th>'.
-                '<th>Degree of Difficulty</th>'.
-                '<th>Degree of Discrimination</th>'.
-                '<th>Time of computation</th>'.
+                '<th>'.&mt('Course').'</th>'.
+                '<th>'.&mt('Section(s)').'</th>'.
+                '<th>'.&mt('Num Student').'s</th>'.
+                '<th>'.&mt('Mean Tries').'</th>'.
+                '<th>'.&mt('Degree of Difficulty').'</th>'.
+                '<th>'.&mt('Degree of Discrimination').'</th>'.
+                '<th>'.&mt('Time of computation').'</th>'.
                 '</tr>'.$/;
             foreach my $identifier (sort(keys(%{$dynmeta{'stats'}}))) {
                 my $data = $dynmeta{'stats'}->{$identifier};
@@ -1015,7 +1195,7 @@ sub print_dynamic_metadata {
             $table .= '</table>'.$/;
             $r->print($table);
         } else {
-            $r->print('No new dynamic data found.');
+            $r->print(&mt('No new dynamic data found.'));
         }
     } else {
         $r->print('<h4>'.
@@ -1041,7 +1221,7 @@ sub print_dynamic_metadata {
     } else {
         $r->print('<h4>'.&mt('No Evaluation Data is available for this resource.').'</h4>');
     }
-    $uri=~/^\/res\/(\w+)\/(\w+)\//; 
+    $uri=~/^\/res\/($match_domain)\/($match_username)\//; 
     if ((($env{'user.domain'} eq $1) && ($env{'user.name'} eq $2))
         || ($env{'user.role.ca./'.$1.'/'.$2})) {
         if (exists($dynmeta{'comments'})) {
@@ -1104,7 +1284,7 @@ sub print_dynamic_metadata {
 #####################################################
 #####################################################
 sub present_editable_metadata {
-    my ($r,$uri, $file_type) = @_;
+    my ($r,$uri,$file_type) = @_;
     # Construction Space Call
     # Header
     my $disuri=$uri;
@@ -1145,7 +1325,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);
@@ -1153,17 +1333,20 @@ ENDBOMBS
 <input type="submit" name="clearmsg" value="$clear" />
 ENDDEL
         } else {
-            $r->print('<a href="'.$disuri.'" />'.$goback.'</a>');
+            $r->print('<p><a href="'.$disuri.'">'.$goback.'</a></p>');
+	    if ($env{'form.clearmsg'}) {
+		my ($diruri) = ($disuri =~ m{(.*/)[^/]*});
+		$r->print('<p><a href="'.$diruri.'">'.
+			  &mt('Back To Directory').'</a></p>');
+	    }
 	}
 	$r->print('<br />'.$bombs);
     } else {
-        my $displayfile='Catalog Information for '.$disuri;
+        my $displayfile=&mt('Catalog Information for [_1]',$disuri);
         if ($disuri=~/\/default$/) {
             my $dir=$disuri;
             $dir=~s/default$//;
-            $displayfile=
-                &mt('Default Cataloging Information for Directory').' '.
-                $dir;
+            $displayfile=&mt('Default Cataloging Information for Directory [_1]',$dir);
         }
         %Apache::lonpublisher::metadatafields=();
         %Apache::lonpublisher::metadatakeys=();
@@ -1173,40 +1356,73 @@ ENDDEL
         } else {
             &Apache::lonpublisher::metaeval($result);
         }
+        if ($env{'form.new_courserestricted'}) {
+            my $new_assoc_course = $env{'form.new_courserestricted'};
+            my $prev_courserestricted = $Apache::lonpublisher::metadatafields{'courserestricted'};
+            if (($prev_courserestricted) && 
+                ($prev_courserestricted ne $new_assoc_course)) {
+                my $transfers = [];
+                foreach my $key (keys(%env)) {
+                    if ($key =~ /^form\.transfer_(.+)$/) {
+                        push(@{$transfers},$1);
+                    }
+                }
+                if (@{$transfers} > 0) {
+                    &store_transferred_addedfields($fn,$uri,$transfers);
+                }
+            }
+        }
         $r->print(<<ENDEDIT);
 <h1>$displayfile</h1>
-<form method="post" name="defaultmeta">
+<form method="post" action="" name="defaultmeta">
 ENDEDIT
-        $r->print('<script language="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');
-	} else {
-	    @fields = ('author','title','subject','keywords','abstract','notes',
-                 'copyright','customdistributionfile','language',
-                 'standards',
-                 'lowestgradelevel','highestgradelevel','sourceavail','sourcerights',
-                 'obsolete','obsoletereplacement');
+	my $added_metadata_fields;
+	my @added_order;
+        if ($file_type eq 'groups') {
+            $Apache::lonpublisher::metadatafields{'courserestricted'}=
+                'course.'.$env{'request.course.id'};
         }
         if ((! $Apache::lonpublisher::metadatafields{'courserestricted'}) &&
-                (! $env{'form.new_courserestricted'})) {
+                (! $env{'form.new_courserestricted'}) && (! $file_type eq 'groups')) {
             $Apache::lonpublisher::metadatafields{'courserestricted'}=
                 'none';
         } elsif ($env{'form.new_courserestricted'}) {
             $Apache::lonpublisher::metadatafields{'courserestricted'}=
-                $env{'form.new_courserestricted'}; 
-        }           
+                $env{'form.new_courserestricted'};
+        }
+	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');
+                if ($Apache::lonpublisher::metadatafields{'courserestricted'} =~ /^course\.($match_domain\_$match_courseid)$/) {
+                    my $assoc_crs = $1;
+	            $added_metadata_fields = &Apache::lonparmset::get_added_meta_fieldnames($assoc_crs);
+	            if ($env{'course.'.$assoc_crs.'.metadata.addedorder'}) {
+	                @added_order = split(/,/,$env{'course.'.$assoc_crs.'.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');
+        }
         if (! $Apache::lonpublisher::metadatafields{'copyright'}) {
                 $Apache::lonpublisher::metadatafields{'copyright'}=
 		    'default';
         }
-	if ($file_type eq 'portfolio') {
+	if (($file_type eq 'portfolio') || ($file_type eq 'groups'))  {
 	    if (! $Apache::lonpublisher::metadatafields{'mime'}) {
                 ($Apache::lonpublisher::metadatafields{'mime'}) =
 		    ( $target=~/\.(\w+)$/ );
@@ -1215,106 +1431,99 @@ ENDEDIT
 		$Apache::lonpublisher::metadatafields{'owner'} =
 		    $env{'user.name'}.':'.$env{'user.domain'};
 	    }
-
+	    if (! $Apache::lonpublisher::metadatafields{'author'}) {
+		$Apache::lonpublisher::metadatafields{'author'} =
+		    &Apache::loncommon::plainname($env{'user.name'},
+						  $env{'user.domain'});
+	    }
 	    if ($Apache::lonpublisher::metadatafields{'courserestricted'} ne 'none') {
-		$r->print(&mt('Associated with course [_1]','<strong>'.$env{$Apache::lonpublisher::metadatafields{'courserestricted'}.".description"}.
-			      '</strong>').'<br />');
+
+                if ($file_type eq 'portfolio') {
+		    $r->print(&mt('Associated with course [_1]',
+		        '<strong><a href="'.$uri.'?changecourse=true">'.
+		        $env{$Apache::lonpublisher::metadatafields{'courserestricted'}.
+		        ".description"}.
+			      '</a></strong>').'<br />');
+                } else {
+                    $r->print(&mt('Associated with course [_1]',
+                        '<strong>'.
+  $env{$Apache::lonpublisher::metadatafields{'courserestricted'}.
+                        ".description"}.'</strong>').'<br />');
+                }
 	    } else {
-		$r->print("This resource is not associated with a course.<br />");
+		$r->print('<a href="'.$uri.'?changecourse=true">'.&mt('This resource is not associated with a course.').'</a><br />');
 	    }
 	}
+	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};
+            }
+        }
+        $output .= &Apache::loncommon::start_data_table();
+        my $row_alt = 1;
         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));
+                my @values = &Apache::loncommon::get_env_multiple('form.new_'.$field_name);
+                my $newvalue = '';
+                foreach my $item (@values) {
+                    if ($item ne '') {
+                        $newvalue .= $item.',';
+                    }
+                }
+                $newvalue =~ s/,$//; 
+                $Apache::lonpublisher::metadatafields{$field_name}=$newvalue;
             }
             if ($Apache::lonpublisher::metadatafields{'courserestricted'} ne 'none'
 		&& exists($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.'.$field_name.'.options'})) {
                 # handle restrictions here
-                if (($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.'.$field_name.'.options'} =~ m/active/) ||
-                    ($field_name eq 'courserestricted')){
-                    $output.=("\n".'<p>'.$lt{$field_name}.': '.
+                if ((($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.'.$field_name.'.options'} =~ m/active/) ||
+                    ($field_name eq 'courserestricted'))&&
+                    (!($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.'.$field_name.'.options'} =~ m/deleted/))){
+                    
+                    $output .= "\n".&Apache::loncommon::start_data_table_row();
+                    $output .= ('<td><span class="LC_metadata">'.$lt{$field_name}.':</span></td><td> '.
                               &prettyinput($field_name,
 				   $Apache::lonpublisher::metadatafields{$field_name},
 				                    'new_'.$field_name,'defaultmeta',
 				                    undef,undef,undef,undef,
-				                    $Apache::lonpublisher::metadatafields{'courserestricted'}).'</p>'."\n");
+				                    $Apache::lonpublisher::metadatafields{'courserestricted'}).'</td>');
+                    $output .= &Apache::loncommon::end_data_table_row();
                  }
             } else {
 
-                    $output.=('<p>'.$lt{$field_name}.': '.
-                            &prettyinput($field_name,
-				   $Apache::lonpublisher::metadatafields{$field_name},
-				   'new_'.$field_name,'defaultmeta').'</p>');
+                    $output.=(&Apache::loncommon::start_data_table_row().'<td><span class="LC_metadata">'.$lt{$field_name}.':</span></td><td> '.
+			      &prettyinput($field_name,
+					   $Apache::lonpublisher::metadatafields{$field_name},
+					   'new_'.$field_name,'defaultmeta').'</td>'.&Apache::loncommon::end_data_table_row());
                
             }
         }
+        $output .= &Apache::loncommon::end_data_table();
 	if ($env{'form.store'}) {
-	    my $mfh;
-	    my $formname='store'; 
-	    my $file_content;
-	    if (&Apache::loncommon::get_env_multiple('form.new_keywords')) {
-		$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]+)/;
-		my $tag=$1;
-		$tag=~tr/A-Z/a-z/;
-		$file_content.= "\n\<$tag";
-		foreach (split(/\,/,
-			       $Apache::lonpublisher::metadatakeys{$unikey})
-			 ) {
-		    my $value=
-			$Apache::lonpublisher::metadatafields{$unikey.'.'.$_};
-		    $value=~s/\"/\'\'/g;
-		    $file_content.=' '.$_.'="'.$value.'"' ;
-		    # print $mfh ' '.$_.'="'.$value.'"';
-		}
-		$file_content.= '>'.
-		    &HTML::Entities::encode
-		    ($Apache::lonpublisher::metadatafields{$unikey},
-		     '<>&"').
-		     '</'.$tag.'>';
-	    }
-	    if ($fn =~ m|^$Apache::lonnet::perlvar{'lonDocRoot'}/userfiles/portfolio/|) {
-		my ($path, $new_fn) = ($fn =~ m|/(portfolio.*)/([^/]*)$|);
-                $r->print(&store_portfolio_metadata($formname,$file_content,$path,
-                                                    $new_fn));    
-            } elsif ($fn =~  m|^$Apache::lonnet::perlvar{'lonDocRoot'}/userfiles/groups/\w+/portfolio/|) {
-                my ($path, $new_fn) = ($fn =~ m|/(groups/\w+/portfolio.*)/([^/]*)$|);
-                $r->print(&store_portfolio_metadata($formname,$file_content,$path,$new_fn));
-	    } else {
-		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;
-		    $r->print('<p><font color="blue">'.&mt('Wrote Metadata').
-			      ' '.&Apache::lonlocal::locallocaltime(time).
-			      '</font></p>');
-		}
-	    }
+            my ($outcome,$result) = &store_metadata($fn,$uri,'store');
+            $r->print($result);
 	}
-	
 	$r->print($output.'<br /><input type="submit" name="store" value="'.
-                  &mt('Store Catalog Information').'">');
+                  &mt('Save Catalog Information').'" />');
 
-	if ($file_type eq 'portfolio') {
+	if ($file_type eq 'portfolio' || $file_type eq 'groups') {
 	    my ($port_path,$group) = &get_port_path_and_group($uri);
-            if ($group) {
+            if ($group ne '') {
                 $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 ne '') {
+	        $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').'" />');
 	}
     }
     
@@ -1323,21 +1532,146 @@ ENDEDIT
     return;
 }
 
+sub store_metadata {
+    my ($fn,$uri,$caller) = @_;
+    my $mfh;
+    my $formname='store';
+    my ($file_content,$output,$outcome);
+    if (&Apache::loncommon::get_env_multiple('form.new_keywords')) {
+        $Apache::lonpublisher::metadatafields{'keywords'} =
+            join (',', &Apache::loncommon::get_env_multiple('form.new_keywords'));
+            }
+    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 my $key (split(/\,/,$Apache::lonpublisher::metadatakeys{$unikey})) {
+            my $value = $Apache::lonpublisher::metadatafields{$unikey.'.'.$key};
+            $value=~s/\"/\'\'/g;
+            $file_content.=' '.$key.'="'.$value.'"' ;
+        }
+        $file_content.= '>'.
+            &HTML::Entities::encode
+                ($Apache::lonpublisher::metadatafields{$unikey},'<>&"').
+                '</'.$tag.'>';
+    }
+    if ($fn =~ m|^$Apache::lonnet::perlvar{'lonDocRoot'}/userfiles|) {
+        my ($path, $new_fn);
+        if ($fn =~ m|$match_name/groups/\w+/portfolio/|) {
+            ($path, $new_fn) = ($fn =~ m|/(groups/\w+/portfolio.*)/([^/]*)$|);
+        } else {
+            ($path, $new_fn) = ($fn =~ m|/(portfolio.*)/([^/]*)$|);
+        }
+        ($outcome,my $result) = 
+            &store_portfolio_metadata($formname,$file_content,
+                                      $path,$new_fn,$uri,$caller);
+        $output .= $result;
+    } else {
+        if (! ($mfh=Apache::File->new('>'.$fn))) {
+            $output .= '<p><font color="red">';
+            if ($caller eq 'transfer') {
+                $output .= &mt('Could not transfer data in added fields to notes');
+            } else { 
+                $output .= &mt('Could not write metadata');
+            }
+            $output .= ', '.&mt('FAIL').'</font></p>';
+            $outcome = 'fail';
+        } else {
+            print $mfh ($file_content);
+            close($mfh);
+            &update_metadata_table($uri);
+            $output .= '<p><font color="blue">';
+            if ($caller eq 'transfer') {
+                $output .= &mt('Transferred data in added fields to notes');
+            } else {
+                $output .= &mt('Wrote Metadata');
+            }
+            $output .= ' '.&Apache::lonlocal::locallocaltime(time).
+                       '</font></p>';
+            $outcome = 'ok';
+        }
+    }
+    return ($outcome,$output);
+}
+
+sub store_transferred_addedfields {
+    my ($fn,$uri,$transfers) = @_;
+    foreach my $item (@{$transfers}) {
+        $Apache::lonpublisher::metadatafields{'notes'} .= 
+           ' '.$item.' = '.$Apache::lonpublisher::metadatafields{$item};
+    }
+    my ($outcome,$output) = &store_metadata($fn,$uri,'transfer');
+    if ($outcome eq 'ok') {
+        foreach my $item (@{$transfers}) {
+            delete($Apache::lonpublisher::metadatafields{$item});
+        }
+    }
+}
+
 sub store_portfolio_metadata {
-    my ($formname,$content,$path,$new_fn) = @_;
+    my ($formname,$content,$path,$new_fn,$uri,$caller) = @_;
+    my ($outcome,$output);
     $env{'form.'.$formname}=$content."\n";
     $env{'form.'.$formname.'.filename'}=$new_fn;
     my $result =&Apache::lonnet::userfileupload($formname,'',$path);
     if ($result =~ /(error|notfound)/) {
-        return '<p><font color="red">'.
-                  &mt('Could not write metadata').', '.
-                  &mt('FAIL').'</font></p>';
+        $output = '<p><font color="red">';
+        if ($caller eq 'transfer') {
+            $output .= 
+                &mt('Could not transfer data in added fields to notes'); 
+        } else {
+            $output .= &mt('Could not write metadata');
+        }
+        $output .= ', '.&mt('FAIL').'</font></p>';
+        $outcome = 'fail';
     } else {
-        return '<p><font color="blue">'.&mt('Wrote Metadata').
-                  ' '.&Apache::lonlocal::locallocaltime(time).'</font></p>';
+        &update_metadata_table($uri);
+        $output = '<p><font color="blue">';
+        if ($caller eq 'transfer') {
+            $output .= &mt('Transferred data in added fields to notes');
+        } else {
+            $output .= &mt('Wrote Metadata');
+        }
+        $output .= ' '.&Apache::lonlocal::locallocaltime(time).
+                   '</font></p>';
+        $outcome = 'ok';
+    }
+    return ($outcome,$output);
+}
+
+sub update_metadata_table {
+    my ($uri) = @_;
+    my ($type,$udom,$uname,$file_name,$group) =
+	&Apache::lonnet::parse_portfolio_url($uri);
+    $file_name =~ s/\.meta$//;
+    my $current_permissions =
+        &Apache::lonnet::get_portfile_permissions($udom,$uname);
+    my %access_controls =
+        &Apache::lonnet::get_access_controls($current_permissions,$group,
+                                             $file_name);
+    my $access_hash = $access_controls{$file_name};
+    my $available = 0;
+    if (ref($access_hash) eq 'HASH') {
+        foreach my $key (keys(%{$access_hash})) {
+            my ($num,$scope,$end,$start) =
+                ($key =~ /^([^:]+):([a-z]+)_(\d*)_?(\d*)$/);
+            if ($scope eq 'public' || $scope eq 'guest') {
+                $available = 1;
+                last;
+            }
+        }
+    }
+    if ($available) {
+        my $result =
+            &Apache::lonnet::update_portfolio_table($uname,$udom,
+            $file_name,'portfolio_metadata',$group,'update');
     }
 }
 
+
 1;
 __END__