--- loncom/interface/lonmeta.pm	2005/12/29 19:42:44	1.149
+++ loncom/interface/lonmeta.pm	2008/12/10 18:43:32	1.218
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.149 2005/12/29 19:42:44 albertel Exp $
+# $Id: lonmeta.pm,v 1.218 2008/12/10 18:43:32 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -39,29 +39,12 @@ use Apache::lonpublisher;
 use Apache::lonlocal;
 use Apache::lonmysql;
 use Apache::lonmsg;
+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();
     }
@@ -71,20 +54,7 @@ sub get_dynamic_metadata_from_sql {
     if (! defined($authordom) || ! defined($author)) {
         return ();
     }
-    my @Fields = ('url','count','course',
-                  'goto','goto_list',
-                  'comefrom','comefrom_list',
-                  'sequsage','sequsage_list',
-                  'stdno','stdno_list',
-		  'dependencies',
-                  'avetries','avetries_list',
-                  'difficulty','difficulty_list',
-                  'disc','disc_list',
-                  'clear','technical','correct',
-                  'helpful','depth');
-    #
-    my $query = 'SELECT '.join(',',@Fields).
-        ' FROM metadata WHERE url LIKE "'.$url.'%"';
+    my $query = 'SELECT * FROM metadata WHERE url LIKE "'.$url.'%"';
     my $server = &Apache::lonnet::homeserver($author,$authordom);
     my $reply = &Apache::lonnet::metadata_query($query,undef,undef,
                                                 ,[$server]);
@@ -106,13 +76,10 @@ sub get_dynamic_metadata_from_sql {
         while (my $result = <$fh>) {
             chomp($result);
             next if (! $result);
-            my @Data = 
-                map { 
-                    &Apache::lonnet::unescape($_); 
-                } split(',',$result);
-            my $url = $Data[0];
-            for (my $i=0;$i<=$#Fields;$i++) {
-                $ReturnHash{$url}->{$Fields[$i]}=$Data[$i];
+            my %hash=&LONCAPA::lonmetadata::metadata_col_to_hash('metadata',
+								 map { &unescape($_) } split(/\,/,$result));
+            foreach my $key (keys(%hash)) {
+                $ReturnHash{$hash{'url'}}->{$key}=$hash{$key};
             }
         }
         $finished = 1;
@@ -126,7 +93,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.'___';
@@ -185,7 +152,7 @@ sub authordisplay {
     my ($aname,$adom)=@_;
     return &Apache::loncommon::aboutmewrapper
         (&Apache::loncommon::plainname($aname,$adom),
-         $aname,$adom,'preview').' <tt>['.$aname.'@'.$adom.']</tt>';
+         $aname,$adom,'preview').' <tt>['.$aname.':'.$adom.']</tt>';
 }
 
 # Pretty display
@@ -250,13 +217,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',
@@ -286,7 +247,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',
@@ -296,25 +257,59 @@ sub fieldnames {
 }
 
 sub portfolio_linked_path {
-    my ($path) = @_;
-    my $result = &Apache::portfolio::make_anchor('portfolio','/');
+    my ($path,$group,$port_path) = @_;
+
+    my $start = 'portfolio';
+    if ($group) {
+	$start = "groups/$group/".$start;
+    }
+    my %anchor_fields = (
+        'selectfile'  => $start,
+        'currentpath' => '/'
+    );
+    my $result = &Apache::portfolio::make_anchor($port_path,\%anchor_fields,$start);
     my $fullpath = '/';
     my (undef,@tree) = split('/',$path);
     my $filename = pop(@tree);
     foreach my $dir (@tree) {
 	$fullpath .= $dir.'/';
 	$result .= '/';
-	$result .= &Apache::portfolio::make_anchor($dir,$fullpath);
+	my %anchor_fields = (
+            'selectfile'  => $dir,
+            'currentpath' => $fullpath
+        );
+	$result .= &Apache::portfolio::make_anchor($port_path,\%anchor_fields,$dir);
     }
     $result .= "/$filename";
     return $result;
 }
 
+sub get_port_path_and_group {
+    my ($uri)=@_;
+
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+
+    my ($port_path,$group);
+    if ($uri =~ m{^/editupload/\Q$cdom\E/\Q$cnum\E/groups/}) {
+	$group = (split('/',$uri))[5];
+	$port_path = '/adm/coursegrp_portfolio';
+    } else {
+	$port_path = '/adm/portfolio';
+    }
+    if ($env{'form.group'} ne $group) {
+	$env{'form.group'} = $group;
+    }
+    return ($port_path,$group);
+}
+
 sub portfolio_display_uri {
     my ($uri,$as_links)=@_;
+
+    my ($port_path,$group) = &get_port_path_and_group($uri);
+
     $uri =~ s|.*/(portfolio/.*)$|$1|;
     my ($res_uri,$meta_uri) = ($uri,$uri);
-
     if ($uri =~ /\.meta$/) {
 	$res_uri =~ s/\.meta//;
     } else {
@@ -322,10 +317,9 @@ sub portfolio_display_uri {
     }
 
     my ($path) = ($res_uri =~ m|^portfolio(.*/)[^/]*$|);
-
     if ($as_links) {
-	$res_uri = &portfolio_linked_path($res_uri);
-	$meta_uri = &portfolio_linked_path($meta_uri);
+	$res_uri = &portfolio_linked_path($res_uri,$group,$port_path);
+	$meta_uri = &portfolio_linked_path($meta_uri,$group,$port_path);
     }
     return ($res_uri,$meta_uri,$path);
 }
@@ -347,47 +341,83 @@ sub pre_select_course {
     $r->print('<p>'.&mt('If you would like to associate this resource ([_1]) with a current or previous course, please select one from the list below, otherwise select, \'None\'','<tt>'.$res_uri.'</tt>').'</p>');
     $output = &select_course();
     $r->print($output.'<br /><input type="submit" name="store" value="'.
-                  &mt('Associate Resource With Selected Course').'">');
+                  &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>');
     
-    $r->print('<br /><br /><form method="POST" action="/adm/portfolio">'.
+    my ($port_path,$group) = &get_port_path_and_group($uri);
+    my $group_input;
+    if ($group) {
+        $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.'" />'.
-	      '<input type="submit" name="cancel" value="'.&mt('Cancel').'">'.
+	      $group_input.
+	      '<input type="submit" name="cancel" value="'.&mt('Cancel').'" />'.
 	      '</form>');
 
     return;
 }
 sub select_course {
-    my %courses;
-    my $output;
-    my $selected;
-    foreach my $key (keys(%env)) { 
-        if ($key =~ m/\.metadata\./) {
-            $key =~ m/^course\.(.+)(\.metadata.+$)/;
-            my $course = $1;
-            my $coursekey = 'course.'.$course.'.description';
-            my $value = $env{$coursekey};
-            $courses{$coursekey} = $value;
+    my $output=$/;
+    my $current_restriction=
+	$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 />';
+                }
+            }
         }
     }
-    my $meta_not_found = 1;
-    if ($Apache::lonpublisher::metadatafields{'courserestricted'} eq 'none') {
-        $selected = ' SELECTED ';
-    } else {
-        $selected = '';
-    }
     $output .= '<select name="new_courserestricted" >';
-    $output .= '<option value="none" '.$selected.'>None</option>';
-    foreach my $key (keys (%courses)) {    
-        $key =~ m/(^.+)\.description$/;
-        if ($Apache::lonpublisher::metadatafields{'courserestricted'} eq $1) {
-            $selected = ' SELECTED ';
-        } else {
-            $selected = '';
-        }
-        $output .= '<option value="'.$1.'"'.$selected.'>';
-        $output .= $courses{$key};
-        $output .= '</option>';
+    $output .= '<option value="none" '.$selected.'>'.
+	&mt('None').'</option>'.$/;
+    my %courses;
+    foreach my $key (keys(%env)) {
+        if ($key !~ m/^course\.(.+)\.description$/) { next; }
+	my $cid = $1;
+        if ($env{$key} !~ /\S/) { next; }
+	$courses{$key} = $cid;
+    }
+    foreach my $key (sort { lc($env{$a}) cmp lc($env{$b}) } (keys(%courses))) {
+	my $cid = 'course.'.$courses{$key};
+	my $selected = ($current_restriction eq $cid ? 'selected="selected"' 
+		                                     : '');
+        if ($env{$key} !~ /\S/) { next; }
+	$output .= '<option value="'.$cid.'" '.$selected.'>';
+	$output .= $env{$key};
+	$output .= '</option>'.$/;
+	$selected = '';
     }
     $output .= '</select><br />';
     return ($output);
@@ -433,7 +463,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
@@ -452,8 +482,8 @@ sub prettyprint {
 	($type eq 'comefrom_list') ||
 	($type eq 'sequsage_list') ||
 	($type eq 'dependencies')) {
-	return '<ul><font size="-1">'.join("\n",map {
-            my $url = &Apache::lonnet::clutter($_);
+	return '<font size="-1"><ul>'.join("\n",map {
+            my $url = &Apache::lonnet::clutter_with_no_wrapper($_);
             my $title = &Apache::lonnet::gettitle($url);
             if ($title eq '') {
                 $title = 'Untitled';
@@ -489,18 +519,26 @@ sub prettyprint {
     # List of courses
     if ($type=~/\_list/) {
         my @Courses = split(/\s*\,\s*/,$value);
-        my $Str;
+        my $Str='<font size="-1"><ul>';
+	my %descriptions;
         foreach my $course (@Courses) {
-            my %courseinfo = &Apache::lonnet::coursedescription($course);
+            my %courseinfo =
+		&Apache::lonnet::coursedescription($course,
+						   {'one_time' => 1});
             if (! exists($courseinfo{'num'}) || $courseinfo{'num'} eq '') {
                 next;
             }
-            if ($Str ne '') { $Str .= '<br />'; }
-            $Str .= '<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>';
+                $courseinfo{'description'}.' ('.$courseinfo{'domain'}.
+		')</a></li>';
         }
-	return $Str;
+	foreach my $course (sort {lc($a) cmp lc($b)} (keys(%descriptions))) {
+	    $Str .= $descriptions{$course};
+	}
+
+	return $Str.'</ul></font>';
     }
     # No pretty print found
     return $value;
@@ -549,7 +587,8 @@ sub prettyinput {
         $size = 80;
     }
     my $output;
-    if (defined($course_key)) {
+    if (defined($course_key) 
+	&& exists($env{$course_key.'.metadata.'.$type.'.options'})) {
         my $stu_add;
         my $only_one;
         my %meta_options;
@@ -574,9 +613,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;
         }
@@ -586,7 +632,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));
@@ -601,7 +649,7 @@ sub prettyinput {
                       $relatedvalue); 
             }
             return ($output);
-        }
+        } 
         if (($type eq 'lowestgradelevel') ||
 	    ($type eq 'highestgradelevel')) {
 	    return &Apache::loncommon::select_level_form($value,$fieldname).
@@ -696,45 +744,61 @@ 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+)\//);
-    my $html=&Apache::lonxml::xmlbegin();
-    $r->print($html.'<head><title>'.
-              'Catalog Information'.
-              '</title></head>');
+        (&Apache::lonnet::declutter($uri)=~/^($match_domain)\/($match_username)\//);
     if ($uri=~m:/adm/bombs/(.*)$:) {
-        $r->print(&Apache::loncommon::bodytag('Error Messages'));
+        $r->print(&Apache::loncommon::start_page('Error Messages'));
         # Looking for all bombs?
         &report_bombs($r,$uri);
-    } elsif ($uri=~/\/portfolio\//) {
+    } elsif ($uri=~m|^/editupload/[^/]+/[^/]+/portfolio/|) {
 	    ($resdomain,$resuser)=
-	    (&Apache::lonnet::declutter($uri)=~m|^(\w+)/(\w+)/portfolio|);
-        $r->print(&Apache::loncommon::bodytag
-          ('Edit Portfolio File Information','','','',$resdomain));
+		(&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=~/^\/\~/) { 
+    } 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::bodytag
-                  ('Edit Catalog Information','','','',$resdomain));
+        $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 {
-        $r->print(&Apache::loncommon::bodytag
-		  ('Catalog Information','','','',$resdomain));
+        $r->print(&Apache::loncommon::start_page('Metadata',
+						 undef,
+						 {'domain' => $resdomain,}));
         &present_uneditable_metadata($r,$uri);
     }
-    $r->print('</body></html>');
+    $r->print(&Apache::loncommon::end_page());
     return OK;
 }
 
@@ -751,16 +815,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);
@@ -788,6 +856,7 @@ ENDCLEAR
 sub present_uneditable_metadata {
     my ($r,$uri) = @_;
     #
+    my $uploaded = ($uri =~ m|/uploaded/|);
     my %content=();
     # Read file
     foreach (split(/\,/,&Apache::lonnet::metadata($uri,'keys'))) {
@@ -797,18 +866,20 @@ sub present_uneditable_metadata {
     # displayed url
     my ($thisversion)=($uri=~/\.(\d+)\.(\w+)\.meta$/);
     $uri=~s/\.meta$//;
-    my $disuri=&Apache::lonnet::clutter($uri);
+    my $disuri=&Apache::lonnet::clutter_with_no_wrapper($uri);
     # version
-    my $currentversion=&Apache::lonnet::getversion($disuri);
     my $versiondisplay='';
-    if ($thisversion) {
-        $versiondisplay=&mt('Version').': '.$thisversion.
-            ' ('.&mt('most recent version').': '.
-            ($currentversion>0 ? 
-             $currentversion   :
-             &mt('information not available')).')';
-    } else {
-        $versiondisplay='Version: '.$currentversion;
+    if (!$uploaded) {
+	my $currentversion=&Apache::lonnet::getversion($disuri);
+	if ($thisversion) {
+	    $versiondisplay=&mt('Version').': '.$thisversion.
+		' ('.&mt('most recent version').': '.
+		($currentversion>0 ? 
+		 $currentversion   :
+		 &mt('information not available')).')';
+	} else {
+	    $versiondisplay='Version: '.$currentversion;
+	}
     }
     # crumbify displayed URL               uri     target prefix form  size
     $disuri=&Apache::lonhtmlcommon::crumbs($disuri,undef, undef, undef,'+1');
@@ -817,9 +888,9 @@ sub present_uneditable_metadata {
     my $obsolete=$content{'obsolete'};
     my $obsoletewarning='';
     if (($obsolete) && ($env{'user.adv'})) {
-        $obsoletewarning='<p><font color="red">'.
+        $obsoletewarning='<p><span class="LC_warning">'.
             &mt('This resource has been marked obsolete by the author(s)').
-            '</font></p>';
+            '</span></p>';
     }
     #
     my %lt=&fieldnames();
@@ -828,44 +899,51 @@ sub present_uneditable_metadata {
     if (! defined($title)) {
         $title = 'Untitled Resource';
     }
-    foreach ('title', 
-             'author', 
-             'subject', 
-             'keywords', 
-             'notes', 
-             'abstract',
-             'lowestgradelevel',
-             'highestgradelevel',
-             'standards', 
-             'mime', 
-             'language', 
-             'creationdate', 
-             'lastrevisiondate', 
-             'owner', 
-             'copyright', 
-             'customdistributionfile',
-             'sourceavail',
-             'sourcerights', 
-             'obsolete', 
-             'obsoletereplacement') {
-        $table.='<tr><td bgcolor="#AAAAAA">'.$lt{$_}.
-            '</td><td bgcolor="#CCCCCC">'.
-            &prettyprint($_,$content{$_}).'</td></tr>';
-        delete $content{$_};
+    my @fields;
+    if ($uploaded) {
+	@fields = ('title','author','subject','keywords','notes','abstract',
+		   'lowestgradelevel','highestgradelevel','standards','mime',
+		   'owner');
+    } else {
+	@fields = ('title', 
+		   'author', 
+		   'subject', 
+		   'keywords', 
+		   'notes', 
+		   'abstract',
+		   'lowestgradelevel',
+		   'highestgradelevel',
+		   'standards', 
+		   'mime', 
+		   'language', 
+		   'creationdate', 
+		   'lastrevisiondate', 
+		   'owner', 
+		   'copyright', 
+		   'customdistributionfile',
+		   'sourceavail',
+		   'sourcerights', 
+		   'obsolete', 
+		   'obsoletereplacement');
+    }
+    foreach my $field (@fields) {
+        $table.=&Apache::lonhtmlcommon::row_title($lt{$field})
+               .&prettyprint($field,$content{$field})
+               .&Apache::lonhtmlcommon::row_closure();
+        delete($content{$field});
     }
     #
-    $r->print(<<ENDHEAD);
-<h2>$title</h2>
-<p>
-$disuri<br />
-$obsoletewarning
-$versiondisplay
-</p>
-<table cellspacing="2" border="0">
-$table
-</table>
-ENDHEAD
-    if ($env{'user.adv'}) {
+    $r->print("<h2>$title</h2>"
+             .'<p>'
+             .$disuri.'<br />'
+             .$obsoletewarning
+             .$versiondisplay
+             .'</p>'
+             .&Apache::lonhtmlcommon::start_pick_box()
+             .$table
+             .&Apache::lonhtmlcommon::end_pick_box()
+    );
+    if (!$uploaded && $env{'user.adv'}) {
         &print_dynamic_metadata($r,$uri,\%content);
     }
     return;
@@ -891,17 +969,18 @@ sub print_dynamic_metadata {
         exists($dynmeta{'goto'}) ||
         exists($dynmeta{'course'})) {
         $r->print('<h4>'.&mt('Access and Usage Statistics').'</h4>'.
-                  '<table cellspacing="2" border="0">');
+                  &Apache::lonhtmlcommon::start_pick_box());
         foreach ('count',
                  'sequsage','sequsage_list',
                  'comefrom','comefrom_list',
                  'goto','goto_list',
                  'course','course_list') {
-            $r->print('<tr><td bgcolor="#AAAAAA">'.$lt{$_}.'</td>'.
-                      '<td bgcolor="#CCCCCC">'.
-                      &prettyprint($_,$dynmeta{$_})."</td></tr>\n");
+            $r->print(&Apache::lonhtmlcommon::row_title($lt{$_})
+                     .&prettyprint($_,$dynmeta{$_})
+                     .&Apache::lonhtmlcommon::row_closure()
+            );
         }
-        $r->print('</table>');
+        $r->print(&Apache::lonhtmlcommon::end_pick_box());
     } else {
         $r->print('<h4>'.&mt('No Access or Usages Statistics are available for this resource.').'</h4>');
     }
@@ -916,46 +995,48 @@ sub print_dynamic_metadata {
             $r->print('<h4>'.
                       &mt('Overall Assessment Statistical Data').
                       '</h4>'.
-                      '<table cellspacing="2" border="0">');
-            $r->print('<tr><td bgcolor="#AAAAAA">'.$lt{'stdno'}.'</td>'.
-                      '<td bgcolor="#CCCCCC">'.
-                      &prettyprint('stdno',$dynmeta{'stdno'}).
-                      '</td>'."</tr>\n");
+                      &Apache::lonhtmlcommon::start_pick_box());
+            $r->print(&Apache::lonhtmlcommon::row_title($lt{'stdno'})
+                     .&prettyprint('stdno',$dynmeta{'stdno'})
+                     .&Apache::lonhtmlcommon::row_closure()
+            );
             foreach ('avetries','difficulty','disc') {
-                $r->print('<tr><td bgcolor="#AAAAAA">'.$lt{$_}.'</td>'.
-                          '<td bgcolor="#CCCCCC">'.
-                          &prettyprint($_,sprintf('%5.2f',$dynmeta{$_})).
-                          '</td>'."</tr>\n");
+                $r->print(&Apache::lonhtmlcommon::row_title($lt{$_})
+                         .&prettyprint($_,sprintf('%5.2f',$dynmeta{$_}))
+                         .&Apache::lonhtmlcommon::row_closure()
+                );
             }
-            $r->print('</table>');    
+            $r->print(&Apache::lonhtmlcommon::end_pick_box());
         }
         if (exists($dynmeta{'stats'})) {
             #
             # 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>'.
-                '</tr>'.$/;
+            my $table=&Apache::loncommon::start_data_table()
+                     .&Apache::loncommon::start_data_table_header_row()
+                     .'<th>'.&mt('Course').'</th>'
+                     .'<th>'.&mt('Section(s)').'</th>'
+                     .'<th>'.&mt('Num Students').'</th>'
+                     .'<th>'.&mt('Mean Tries').'</th>'
+                     .'<th>'.&mt('Degree of Difficulty').'</th>'
+                     .'<th>'.&mt('Degree of Discrimination').'</th>'
+                     .'<th>'.&mt('Time of computation').'</th>'
+                     .&Apache::loncommon::end_data_table_header_row().$/;
             foreach my $identifier (sort(keys(%{$dynmeta{'stats'}}))) {
                 my $data = $dynmeta{'stats'}->{$identifier};
                 my $course = $data->{'course'};
-                my %courseinfo = &Apache::lonnet::coursedescription($course);
+                my %courseinfo = 
+		    &Apache::lonnet::coursedescription($course,
+						       {'one_time' => 1});
                 if (! exists($courseinfo{'num'}) || $courseinfo{'num'} eq '') {
                     &Apache::lonnet::logthis('lookup for '.$course.' failed');
                     next;
                 }
-                $table .= '<tr>';
+                $table .= &Apache::loncommon::start_data_table_row();
                 $table .= 
-                    '<td><nobr>'.$courseinfo{'description'}.'</nobr></td>';
+                    '<td><span class="LC_nobreak">'.$courseinfo{'description'}.'</span></td>';
                 $table .= 
                     '<td align="right">'.$data->{'sections'}.'</td>';
                 $table .=
@@ -970,16 +1051,15 @@ sub print_dynamic_metadata {
                     $table .= '</td>';
                 }
                 $table .=
-                    '<td><nobr>'.
+                    '<td><span class="LC_nobreak">'.
                     &Apache::lonlocal::locallocaltime($data->{'timestamp'}).
-                    '</nobr></td>';
-                $table .=
-                    '</tr>'.$/;
+                    '</span></td>';
+                $table .= &Apache::loncommon::end_data_table_row().$/;
             }
-            $table .= '</table>'.$/;
+            $table .= &Apache::loncommon::end_data_table().$/;
             $r->print($table);
         } else {
-            $r->print('No new dynamic data found.');
+            $r->print(&mt('No new dynamic data found.'));
         }
     } else {
         $r->print('<h4>'.
@@ -995,17 +1075,18 @@ sub print_dynamic_metadata {
         exists($dynmeta{'correct'}) || 
         exists($dynmeta{'technical'})){ 
         $r->print('<h4>'.&mt('Evaluation Data').'</h4>'.
-                  '<table cellspacing="2" border="0">');
+                  &Apache::lonhtmlcommon::start_pick_box());
         foreach ('clear','depth','helpful','correct','technical') {
-            $r->print('<tr><td bgcolor="#AAAAAA">'.$lt{$_}.'</td>'.
-                      '<td bgcolor="#CCCCCC">'.
-                      &prettyprint($_,$dynmeta{$_})."</td></tr>\n");
+            $r->print(&Apache::lonhtmlcommon::row_title($lt{$_})
+                     .&prettyprint($_,$dynmeta{$_})
+                     .&Apache::lonhtmlcommon::row_closure()
+            );
         }
-        $r->print('</table>');
+        $r->print(&Apache::lonhtmlcommon::end_pick_box());
     } 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'})) {
@@ -1029,7 +1110,8 @@ sub print_dynamic_metadata {
     # All other stuff
     $r->print('<h3>'.
               &mt('Additional Metadata (non-standard, parameters, exports)').
-              '</h3><table border="0" cellspacing="1">');
+              '</h3>');
+    $r->print(&Apache::lonhtmlcommon::start_pick_box());
     foreach (sort(keys(%content))) {
         my $name=$_;
         if ($name!~/\.display$/) {
@@ -1047,14 +1129,16 @@ sub print_dynamic_metadata {
                                                   $name.'.'.$_).'; ';
                 }
             }
-            $r->print('<tr><td bgcolor="#bbccbb"><font size="-1" color="#556655">'.$display.'</font></td><td bgcolor="#ccddcc"><font size="-1" color="#556655">'.$content{$name});
+            $r->print(&Apache::lonhtmlcommon::row_title($display)
+                     .$content{$name}
+            );
             if ($otherinfo) {
                 $r->print(' ('.$otherinfo.')');
             }
-            $r->print("</font></td></tr>\n");
+            $r->print(&Apache::lonhtmlcommon::row_closure());
         }
     }
-    $r->print("</table>");
+    $r->print(&Apache::lonhtmlcommon::end_pick_box());
     return;
 }
 
@@ -1068,12 +1152,12 @@ 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;
     my $fn=&Apache::lonnet::filelocation('',$uri);
-    $disuri=~s/^\/\~/\/priv\//;
+    $disuri=~s{^/\~}{/priv/};
     $disuri=~s/\.meta$//;
     my $meta_uri = $disuri;
     my $path;
@@ -1081,7 +1165,7 @@ sub present_editable_metadata {
 	($disuri, $meta_uri, $path) =  &portfolio_display_uri($disuri,1);
     }
     my $target=$uri;
-    $target=~s/^\/\~/\/res\/$env{'request.role.domain'}\//;
+    $target=~s{^/\~}{/res/$env{'request.role.domain'}/};
     $target=~s/\.meta$//;
     my $bombs=&Apache::lonmsg::retrieve_author_res_msg($target);
     if ($bombs) {
@@ -1109,7 +1193,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);
@@ -1117,17 +1201,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('Metadata for [_1]',$disuri);
         if ($disuri=~/\/default$/) {
             my $dir=$disuri;
             $dir=~s/default$//;
-            $displayfile=
-                &mt('Default Cataloging Information for Directory').' '.
-                $dir;
+            $displayfile=&mt('Default Metadata for Directory [_1]',$dir);
         }
         %Apache::lonpublisher::metadatafields=();
         %Apache::lonpublisher::metadatakeys=();
@@ -1137,141 +1224,174 @@ 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';
+		    '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+)$/ );
+	    }
+	    if (! $Apache::lonpublisher::metadatafields{'owner'}) {
+		$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') {
+            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|/portfolio/|) {
-		my ($path, $new_fn) = ($fn =~ m|/(portfolio.*)/([^/]*)$|);
-		$env{'form.'.$formname}=$file_content."\n";
-		$env{'form.'.$formname.'.filename'}=$new_fn;
-		my $result =&Apache::lonnet::userfileupload($formname,'',
-							    $path);
-		
-		if ($result =~ /(error|notfound)/) {
-		    $r->print('<p><font color="red">'.
-			      &mt('Could not write metadata').', '.
-			      &mt('FAIL').'</font></p>');
-		} else {
-		    $r->print('<p><font color="blue">'.&mt('Wrote Metadata').
-			      ' '.&Apache::lonlocal::locallocaltime(time).
-			      '</font></p>');
-		}
-	    } 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').'">');
-
-	if ($file_type eq 'portfolio') {
-	    $r->print('</form>
-               <br /><br /><form method="POST" action="/adm/portfolio">'.
-		      '<input type="hidden" name="currentpath" value="'.$path.'" />'.
-		      '<input type="submit" name="cancel" value="'.&mt('Discard Edits and Return to Portfolio').'">');
+	$r->print($output.'<br /><input type="submit" title="'.&mt('Save Metadata').'" name="store" value="'.
+                  &mt('Save').'" />');
+
+	if ($file_type eq 'portfolio' || $file_type eq 'groups') {
+	    my ($port_path,$group) = &get_port_path_and_group($uri);
+            if ($group ne '') {
+                $r->print('<input type="hidden" name="group" value="'.$group.'" />');
+            }
+            $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').'" />');
 	}
     }
     
@@ -1280,7 +1400,238 @@ 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,$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)/) {
+        $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 {
+        &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__
 
-     
+
+=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 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