--- loncom/interface/lonmeta.pm	2007/01/02 12:54:40	1.192
+++ loncom/interface/lonmeta.pm	2007/01/16 07:26:45	1.199
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.192 2007/01/02 12:54:40 raeburn Exp $
+# $Id: lonmeta.pm,v 1.199 2007/01/16 07:26:45 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -598,9 +598,15 @@ sub prettyinput {
                 if ($meta_options{$item}) {
                     push(@cur_values_inst,$item);
                 } else {
-                    $cur_values_stu .= $item.',';
+                    if ($item ne 'Not Specified') {
+                        $cur_values_stu .= $item.',';
+                    }
                 }
             }
+            my @key_order = sort(keys(%meta_options));
+            unshift (@key_order,'Not Specified');
+            $meta_options{'Not Specified'} = 'Not Specified';
+            $meta_options{'select_form_order'} = \@key_order;
         } else {
             $cur_values_stu = $value;
         }
@@ -608,11 +614,11 @@ sub prettyinput {
             return (&select_course());
             # return ('<input type="hidden" name="new_courserestricted" value="'.$course_key.'" />');
         }
-        my $course = $env{'request.course.id'};
         if (($type eq 'keywords') || ($type eq 'subject')
              || ($type eq 'author')||($type eq  'notes')
              || ($type eq  'abstract')|| ($type eq  'title')|| ($type eq  'standards')
-             || (exists($env{'course.'.$env{'request.course.id'}.'.metadata.'.$type.'.added'}))) {
+             || (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));
@@ -750,7 +756,6 @@ sub handler {
             %Apache::lonpublisher::metadatakeys=();
             my $result=&Apache::lonnet::getfile($fn);
             &Apache::lonpublisher::metaeval($result);
-            &Apache::lonnet::logthis("restricted is: ".$Apache::lonpublisher::metadatafields{'courserestricted'});
             if ((!$Apache::lonpublisher::metadatafields{'courserestricted'}) ||
                 ($env{'form.changecourse'} eq 'true')) {
                 &pre_select_course($r,$uri);
@@ -1203,6 +1208,18 @@ ENDEDIT
 	my @fields;
 	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'}) && (! $file_type eq 'groups')) {
+            $Apache::lonpublisher::metadatafields{'courserestricted'}=
+                'none';
+        } elsif ($env{'form.new_courserestricted'}) {
+            $Apache::lonpublisher::metadatafields{'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
@@ -1212,11 +1229,14 @@ ENDEDIT
 	        @fields =  ('author','title','subject','keywords','abstract',
 			    'notes','lowestgradelevel',
 	                    'highestgradelevel','standards');
-	        $added_metadata_fields = &Apache::lonparmset::get_added_meta_fieldnames();
-	        if ($env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'}) {
-	            @added_order = split(/,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'});
-	        }
-	        $env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.fieldlist'} = join(",",@fields);
+                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',
@@ -1225,18 +1245,6 @@ ENDEDIT
 		       'lowestgradelevel','highestgradelevel','sourceavail','sourcerights',
 		       'obsolete','obsoletereplacement');
         }
-        if ($file_type eq 'groups') {
-            $Apache::lonpublisher::metadatafields{'courserestricted'}=
-                'course.'.$env{'request.course.id'}; 
-        }
-        if ((! $Apache::lonpublisher::metadatafields{'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'}; 
-        }           
         if (! $Apache::lonpublisher::metadatafields{'copyright'}) {
                 $Apache::lonpublisher::metadatafields{'copyright'}=
 		    'default';
@@ -1250,8 +1258,8 @@ ENDEDIT
 		$Apache::lonpublisher::metadatafields{'owner'} =
 		    $env{'user.name'}.':'.$env{'user.domain'};
 	    }
-
 	    if ($Apache::lonpublisher::metadatafields{'courserestricted'} ne 'none') {
+
                 if ($file_type eq 'portfolio') {
 		    $r->print(&mt('Associated with course [_1]',
 		        '<strong><a href="'.$uri.'?changecourse=true">'.
@@ -1406,22 +1414,14 @@ sub store_portfolio_metadata {
 
 sub update_metadata_table {
     my ($uri) = @_;
-    my ($group,$file_name);
-    my ($udom,$uname,$remainder) =
-        ($uri=~m -^/+(?:uploaded|editupload)/+($match_domain)/+($match_name)/+(.*)$-);
-
-    if ($remainder =~ /groups\/(\w+)\/portfolio(\/.+)$/) {
-        $group = $1;
-        $file_name = $2;
-    } elsif ($remainder =~ /portfolio(\/.+)$/) {
-        $file_name = $1;
-    }
+    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,
-                                             $group.$file_name);
+                                             $file_name);
     my $access_hash = $access_controls{$file_name};
     my $available = 0;
     if (ref($access_hash) eq 'HASH') {
@@ -1437,7 +1437,7 @@ sub update_metadata_table {
     if ($available) {
         my $result =
             &Apache::lonnet::update_portfolio_table($uname,$udom,
-            $file_name,'portfolio_metadata',$group);
+            $file_name,'portfolio_metadata',$group,'update');
     }
 }