|
version 1.683.2.6, 2006/01/07 00:28:34
|
version 1.683.2.10, 2006/01/11 20:26:45
|
|
Line 3405 sub is_on_map {
|
Line 3405 sub is_on_map {
|
| my $filename=$uriparts[$#uriparts]; |
my $filename=$uriparts[$#uriparts]; |
| my $pathname=$uri; |
my $pathname=$uri; |
| $pathname=~s|/\Q$filename\E$||; |
$pathname=~s|/\Q$filename\E$||; |
| $pathname=~s/^adm\/wrapper\///; |
$pathname=~s/^adm\/wrapper\///; |
| |
$pathname=~s/^adm\/coursedocs\/showdoc\///; |
| #Trying to find the conditional for the file |
#Trying to find the conditional for the file |
| my $match=($env{'acc.res.'.$env{'request.course.id'}.'.'.$pathname}=~ |
my $match=($env{'acc.res.'.$env{'request.course.id'}.'.'.$pathname}=~ |
| /\&\Q$filename\E\:([\d\|]+)\&/); |
/\&\Q$filename\E\:([\d\|]+)\&/); |
|
Line 4929 sub EXT {
|
Line 4930 sub EXT {
|
| if ($space eq 'time') { |
if ($space eq 'time') { |
| return time; |
return time; |
| } |
} |
| |
} elsif ($realm eq 'server') { |
| |
# ----------------------------------------------------------------- system.time |
| |
if ($space eq 'name') { |
| |
return $ENV{'SERVER_NAME'}; |
| |
} |
| } |
} |
| return ''; |
return ''; |
| } |
} |
|
Line 5293 sub symbverify {
|
Line 5299 sub symbverify {
|
| my $thisfn=$thisurl; |
my $thisfn=$thisurl; |
| # wrapper not part of symbs |
# wrapper not part of symbs |
| $thisfn=~s/^\/adm\/wrapper//; |
$thisfn=~s/^\/adm\/wrapper//; |
| |
$thisfn=~s/^\/adm\/coursedocs\/showdoc\///; |
| $thisfn=&declutter($thisfn); |
$thisfn=&declutter($thisfn); |
| # direct jump to resource in page or to a sequence - will construct own symbs |
# direct jump to resource in page or to a sequence - will construct own symbs |
| if ($thisfn=~/\.(page|sequence)$/) { return 1; } |
if ($thisfn=~/\.(page|sequence)$/) { return 1; } |
|
Line 5347 sub symbclean {
|
Line 5354 sub symbclean {
|
| # remove wrapper |
# remove wrapper |
| |
|
| $symb=~s/(\_\_\_\d+\_\_\_)adm\/wrapper\/(res\/)*/$1/; |
$symb=~s/(\_\_\_\d+\_\_\_)adm\/wrapper\/(res\/)*/$1/; |
| |
$symb=~s/(\_\_\_\d+\_\_\_)adm\/coursedocs\/showdoc\/(res\/)*/$1/; |
| return $symb; |
return $symb; |
| } |
} |
| |
|
|
Line 6079 sub declutter {
|
Line 6087 sub declutter {
|
| if ($thisfn=~m|^/enc/|) { $thisfn=&Apache::lonenc::unencrypted($thisfn); } |
if ($thisfn=~m|^/enc/|) { $thisfn=&Apache::lonenc::unencrypted($thisfn); } |
| $thisfn=~s/^\Q$perlvar{'lonDocRoot'}\E//; |
$thisfn=~s/^\Q$perlvar{'lonDocRoot'}\E//; |
| $thisfn=~s/^\///; |
$thisfn=~s/^\///; |
| |
$thisfn=~s|^adm/wrapper/||; |
| |
$thisfn=~s|^adm/coursedocs/showdoc/||; |
| $thisfn=~s/^res\///; |
$thisfn=~s/^res\///; |
| $thisfn=~s/\?.+$//; |
$thisfn=~s/\?.+$//; |
| return $thisfn; |
return $thisfn; |
|
Line 6091 sub clutter {
|
Line 6101 sub clutter {
|
| unless ($thisfn=~/^\/(uploaded|editupload|adm|userfiles|ext|raw|priv|public)\//) { |
unless ($thisfn=~/^\/(uploaded|editupload|adm|userfiles|ext|raw|priv|public)\//) { |
| $thisfn='/res'.$thisfn; |
$thisfn='/res'.$thisfn; |
| } |
} |
| |
if ($thisfn !~m|/adm|) { |
| |
if ($thisfn =~ m|/ext/|) { |
| |
$thisfn='/adm/wrapper'.$thisfn; |
| |
} else { |
| |
my ($ext) = ($thisfn =~ /\.(\w+)$/); |
| |
my $embstyle=&Apache::loncommon::fileembstyle($ext); |
| |
if ($embstyle eq 'ssi' |
| |
|| ($embstyle eq 'hdn') |
| |
|| ($embstyle eq 'rat') |
| |
|| ($embstyle eq 'prv') |
| |
|| ($embstyle eq 'ign')) { |
| |
#do nothing with these |
| |
} elsif (($embstyle eq 'img') |
| |
|| ($embstyle eq 'emb') |
| |
|| ($embstyle eq 'wrp')) { |
| |
$thisfn='/adm/wrapper'.$thisfn; |
| |
} elsif ($embstyle eq 'unk' |
| |
&& $thisfn!~/\.(sequence|page)$/) { |
| |
$thisfn='/adm/coursedocs/showdoc'.$thisfn; |
| |
} else { |
| |
&logthis("Got a blank emb style"); |
| |
} |
| |
} |
| |
} |
| return $thisfn; |
return $thisfn; |
| } |
} |
| |
|
![[BACK]](/icons/back.gif){kind=icon}
Return to lonnet.pm CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [LON-CAPA] / loncom / lonnet / perl