[BACK]Return to lonmeta.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonmeta.pm between versions 1.194 and 1.196

version 1.194, 2007/01/12 19:56:07 version 1.196, 2007/01/12 22:13:51
Line 1203  ENDEDIT Line 1203  ENDEDIT
  my @fields;   my @fields;
  my $added_metadata_fields;   my $added_metadata_fields;
  my @added_order;   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 ($file_type eq 'portfolio' || $file_type eq 'groups') {
     if(exists ($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.fieldlist'})) {      if(exists ($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.fieldlist'})) {
         # retrieve fieldnames (in order) from the course restricted list          # retrieve fieldnames (in order) from the course restricted list
Line 1212  ENDEDIT Line 1224  ENDEDIT
         @fields =  ('author','title','subject','keywords','abstract',          @fields =  ('author','title','subject','keywords','abstract',
     'notes','lowestgradelevel',      'notes','lowestgradelevel',
                     'highestgradelevel','standards');                      'highestgradelevel','standards');
         $added_metadata_fields = &Apache::lonparmset::get_added_meta_fieldnames();                  if ($Apache::lonpublisher::metadatafields{'courserestricted'} =~ /^course\.($match_domain\_$match_courseid)$/) {
         if ($env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'}) {                      my $assoc_crs = $1;
             @added_order = split(/,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'});              $added_metadata_fields = &Apache::lonparmset::get_added_meta_fieldnames($assoc_crs);
         }              if ($env{'course.'.$assoc_crs.'.metadata.addedorder'}) {
         $env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.fieldlist'} = join(",",@fields);                  @added_order = split(/,/,$env{'course.'.$assoc_crs.'.metadata.addedorder'});
               }
               $env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.fieldlist'} = join(",",@fields);
                   }
     }      }
  } else {   } else {
     @fields = ('author','title','subject','keywords','abstract','notes',      @fields = ('author','title','subject','keywords','abstract','notes',
Line 1225  ENDEDIT Line 1240  ENDEDIT
        'lowestgradelevel','highestgradelevel','sourceavail','sourcerights',         'lowestgradelevel','highestgradelevel','sourceavail','sourcerights',
        'obsolete','obsoletereplacement');         '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'}) {          if (! $Apache::lonpublisher::metadatafields{'copyright'}) {
                 $Apache::lonpublisher::metadatafields{'copyright'}=                  $Apache::lonpublisher::metadatafields{'copyright'}=
     'default';      'default';
Line 1406  sub store_portfolio_metadata { Line 1409  sub store_portfolio_metadata {
   
 sub update_metadata_table {  sub update_metadata_table {
     my ($uri) = @_;      my ($uri) = @_;
     my ($group,$file_name);      my ($type,$udom,$uname,$file_name,$group) =
     my ($udom,$uname,$remainder) =   &Apache::lonnet::parse_portfolio_url($uri);
         ($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$//;      $file_name =~ s/\.meta$//;
     my $current_permissions =      my $current_permissions =
         &Apache::lonnet::get_portfile_permissions($udom,$uname);          &Apache::lonnet::get_portfile_permissions($udom,$uname);
     my %access_controls =      my %access_controls =
         &Apache::lonnet::get_access_controls($current_permissions,$group,          &Apache::lonnet::get_access_controls($current_permissions,$group,
                                              $group.$file_name);                                               $file_name);
     my $access_hash = $access_controls{$file_name};      my $access_hash = $access_controls{$file_name};
     my $available = 0;      my $available = 0;
     if (ref($access_hash) eq 'HASH') {      if (ref($access_hash) eq 'HASH') {
Removed from v.1.194  
changed lines
  Added in v.1.196

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>