--- loncom/interface/lonmeta.pm	2006/12/05 02:55:53	1.190
+++ loncom/interface/lonmeta.pm	2007/01/12 20:04:16	1.195
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.190 2006/12/05 02:55:53 albertel Exp $
+# $Id: lonmeta.pm,v 1.195 2007/01/12 20:04:16 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -235,7 +235,7 @@ sub fieldnames {
          'lowestgradelevel' => 'Lowest Grade Level',
          'highestgradelevel' => 'Highest Grade Level');
     
-    if (! defined($file_type) || $file_type ne 'portfolio') {
+    if ( !defined($file_type) || ($file_type ne 'portfolio' && $file_type ne 'groups') ) {
         %fields = 
         (%fields,
          'domain' => 'Domain',
@@ -1203,6 +1203,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 +1224,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 +1240,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';
@@ -1252,11 +1255,18 @@ ENDEDIT
 	    }
 
 	    if ($Apache::lonpublisher::metadatafields{'courserestricted'} ne 'none') {
-		$r->print(&mt('Associated with course [_1]',
+                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('<a href="'.$uri.'?changecourse=true">This resource is not associated with a course.</a><br />');
 	    }
@@ -1342,7 +1352,7 @@ ENDEDIT
 		    ($path, $new_fn) = ($fn =~ m|/(portfolio.*)/([^/]*)$|);
 	        }
                 $r->print(&store_portfolio_metadata($formname,$file_content,$path,
-                                                    $new_fn));
+                                                    $new_fn,$uri));
             } else {
 		if (! ($mfh=Apache::File->new('>'.$fn))) {
 		    $r->print('<p><font color="red">'.
@@ -1350,6 +1360,8 @@ ENDEDIT
 			      &mt('FAIL').'</font></p>');
 		} else {
 		    print $mfh ($file_content);
+                    close($mfh);
+                    &update_metadata_table($uri);
 		    $r->print('<p><font color="blue">'.&mt('Wrote Metadata').
 			      ' '.&Apache::lonlocal::locallocaltime(time).
 			      '</font></p>');
@@ -1359,16 +1371,16 @@ ENDEDIT
 	$r->print($output.'<br /><input type="submit" name="store" value="'.
                   &mt('Store 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('<input type="hidden" name="currentpath" value="'.$env{'form.currentpath'}.'" />');
 	    $r->print('</form><br /><br /><form method="post" action="'.$port_path.'">');
-	    if ($group) {
+	    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').'" />');
 	}
@@ -1380,7 +1392,7 @@ ENDEDIT
 }
 
 sub store_portfolio_metadata {
-    my ($formname,$content,$path,$new_fn) = @_;
+    my ($formname,$content,$path,$new_fn,$uri) = @_;
     $env{'form.'.$formname}=$content."\n";
     $env{'form.'.$formname.'.filename'}=$new_fn;
     my $result =&Apache::lonnet::userfileupload($formname,'',$path);
@@ -1389,11 +1401,50 @@ sub store_portfolio_metadata {
                   &mt('Could not write metadata').', '.
                   &mt('FAIL').'</font></p>';
     } else {
+        &update_metadata_table($uri);
         return '<p><font color="blue">'.&mt('Wrote Metadata').
                   ' '.&Apache::lonlocal::locallocaltime(time).'</font></p>';
     }
 }
 
+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;
+    }
+    $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);
+    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__