loncom/lonnet/perl/lonnet.pm - diff

Return to lonnet.pm CVS log

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

version 1.694, 2006/01/10 21:41:39	version 1.695, 2006/01/11 07:32:21
Line 6146 sub declutter {	Line 6146 sub declutter {
$thisfn=~s/^\///;	$thisfn=~s/^\///;
$thisfn=~s/^res\///;	$thisfn=~s/^res\///;
$thisfn=~s/\?.+$//;	$thisfn=~s/\?.+$//;
$thisfn=~s\|adm/wrapper/\|\|;	$thisfn=~s\|^adm/wrapper/\|\|;
$thisfn=~s\|adm/coursedocs/showdoc/\|\|;	$thisfn=~s\|^adm/coursedocs/showdoc/\|\|;
return $thisfn;	return $thisfn;
}	}

Line 6159 sub clutter {	Line 6159 sub clutter {
$thisfn='/res'.$thisfn;	$thisfn='/res'.$thisfn;
}	}
if ($thisfn !~m\|/adm\|) {	if ($thisfn !~m\|/adm\|) {
my ($ext) = ($thisfn =~ /\.(\w+)$/);	if ($thisfn =~ m\|/ext/\|) {
my $embstyle=&Apache::loncommon::fileembstyle($ext);
if (($embstyle eq 'img')
\|\| ($embstyle eq 'emb')
\|\| ($embstyle eq 'wrp')) {
$thisfn='/adm/wrapper'.$thisfn;	$thisfn='/adm/wrapper'.$thisfn;
} elsif ($embstyle eq 'ssi') {	} else {
#do nothing with these	my ($ext) = ($thisfn =~ /\.(\w+)$/);
} elsif ($thisfn!~/\.(sequence\|page)$/) {	my $embstyle=&Apache::loncommon::fileembstyle($ext);
$thisfn='/adm/coursedocs/showdoc'.$thisfn;	if (($embstyle eq 'img')
	\|\| ($embstyle eq 'emb')
	\|\| ($embstyle eq 'wrp')) {
	$thisfn='/adm/wrapper'.$thisfn;
	} elsif ($embstyle eq 'ssi') {
	#do nothing with these
	} elsif ($thisfn!~/\.(sequence\|page)$/) {
	$thisfn='/adm/coursedocs/showdoc'.$thisfn;
	}
}	}
}	}

return $thisfn;	return $thisfn;
}	}