--- loncom/interface/lonmeta.pm 2006/11/20 20:58:30 1.189 +++ loncom/interface/lonmeta.pm 2007/01/12 19:56:07 1.194 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Metadata display handler # -# $Id: lonmeta.pm,v 1.189 2006/11/20 20:58:30 banghart Exp $ +# $Id: lonmeta.pm,v 1.194 2007/01/12 19:56:07 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -39,8 +39,7 @@ 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); ############################################################ @@ -63,7 +62,7 @@ use LONCAPA; ############################################################ 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(); } @@ -112,7 +111,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.'___'; @@ -236,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', @@ -449,7 +448,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 @@ -732,14 +731,14 @@ sub handler { $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,})); @@ -793,7 +792,7 @@ sub report_bombs { $uri =~ s:/adm/bombs/::; $uri = &Apache::lonnet::declutter($uri); $r->print('

'.&Apache::lonnet::clutter($uri).'

'); - 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); @@ -1060,7 +1059,7 @@ sub print_dynamic_metadata { } else { $r->print('

'.&mt('No Evaluation Data is available for this resource.').'

'); } - $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'})) { @@ -1253,11 +1252,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]', ''. $env{$Apache::lonpublisher::metadatafields{'courserestricted'}. ".description"}. '').'
'); + } else { + $r->print(&mt('Associated with course [_1]', + ''. + $env{$Apache::lonpublisher::metadatafields{'courserestricted'}. + ".description"}.'').'
'); + } } else { $r->print('This resource is not associated with a course.
'); } @@ -1337,13 +1343,13 @@ ENDEDIT } if ($fn =~ m|^$Apache::lonnet::perlvar{'lonDocRoot'}/userfiles|) { my ($path, $new_fn); - if ($fn =~ m|\w+/groups/\w+/portfolio/|) { + if ($fn =~ m|$match_name/groups/\w+/portfolio/|) { ($path, $new_fn) = ($fn =~ m|/(groups/\w+/portfolio.*)/([^/]*)$|); } else { ($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('

'. @@ -1351,6 +1357,8 @@ ENDEDIT &mt('FAIL').'

'); } else { print $mfh ($file_content); + close($mfh); + &update_metadata_table($uri); $r->print('

'.&mt('Wrote Metadata'). ' '.&Apache::lonlocal::locallocaltime(time). '

'); @@ -1360,16 +1368,16 @@ ENDEDIT $r->print($output.'
'); - 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(''); } $r->print(''); $r->print('

'); - if ($group) { + if ($group ne '') { $r->print(''); - } + } $r->print(''. ''); } @@ -1381,7 +1389,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); @@ -1390,11 +1398,50 @@ sub store_portfolio_metadata { &mt('Could not write metadata').', '. &mt('FAIL').'

'; } else { + &update_metadata_table($uri); return '

'.&mt('Wrote Metadata'). ' '.&Apache::lonlocal::locallocaltime(time).'

'; } } +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__