loncom/lonnet/perl/lonnet.pm - diff

Return to lonnet.pm CVS log

Up to [LON-CAPA] / loncom / lonnet / perl

version 1.1056.4.25, 2011/05/14 17:16:49	version 1.1056.4.26, 2011/06/03 00:31:30
Line 8601 sub metadata {	Line 8601 sub metadata {
if (($uri eq '') \|\|	if (($uri eq '') \|\|
(($uri =~ m\|^/*adm/\|) &&	(($uri =~ m\|^/*adm/\|) &&
($uri !~ m\|^adm/includes\|) && ($uri !~ m\|/bulletinboard$\|)) \|\|	($uri !~ m\|^adm/includes\|) && ($uri !~ m\|/bulletinboard$\|)) \|\|
($uri =~ m\|/$\|) \|\| ($uri =~ m\|/.meta$\|) \|\| ($uri =~ m{^/uploaded/.+\.sequence$}) \|\| ($uri =~ m{^/uploaded/$match_domain/$match_courseid/docs/})) {	($uri =~ m\|/$\|) \|\| ($uri =~ m\|/.meta$\|) \|\| ($uri =~ m{^/*uploaded/.+\.sequence$})) {
return undef;	return undef;
}	}
if (($uri =~ /^~/ \|\| $uri =~ m{home/$match_username/public_html/})	if (($uri =~ /^~/ \|\| $uri =~ m{home/$match_username/public_html/})
Line 8643 sub metadata {	Line 8643 sub metadata {
&Apache::lonnet::ssi_body($which,	&Apache::lonnet::ssi_body($which,
('grade_target' => 'meta'));	('grade_target' => 'meta'));
$cachetime = 1; # only want this cached in the child not long term	$cachetime = 1; # only want this cached in the child not long term
} elsif ($uri !~ m -^(editupload)/-) {	} elsif (($uri !~ m -^(editupload)/-) &&
	($uri !~ m{^/*uploaded/$match_domain/$match_courseid/docs/})) {
my $file=&filelocation('',&clutter($filename));	my $file=&filelocation('',&clutter($filename));
#push(@{$metaentry{$uri.'.file'}},$file);	#push(@{$metaentry{$uri.'.file'}},$file);
$metastring=&getfile($file);	$metastring=&getfile($file);