version 1.66, 2003/11/01 16:37:22
|
version 1.72, 2004/04/05 18:25:08
|
Line 77 sub putinversion {
|
Line 77 sub putinversion {
|
if ($version eq &Apache::lonnet::getversion( |
if ($version eq &Apache::lonnet::getversion( |
&Apache::lonnet::filelocation('',$uri))) |
&Apache::lonnet::filelocation('',$uri))) |
{ return $uri; } |
{ return $uri; } |
&Apache::lonnet::logthis($uri.' '.$version.' '. &Apache::lonnet::getversion( |
|
&Apache::lonnet::filelocation('',$uri))); |
|
$uri=~s/\.(\w+)$/\.$version\.$1/; |
$uri=~s/\.(\w+)$/\.$version\.$1/; |
} |
} |
return $uri; |
return $uri; |
Line 161 sub loadmap {
|
Line 159 sub loadmap {
|
} elsif ($turi=~/^\/*uploaded\//) { # uploaded |
} elsif ($turi=~/^\/*uploaded\//) { # uploaded |
if (($embstyle eq 'img') || ($embstyle eq 'emb') |
if (($embstyle eq 'img') || ($embstyle eq 'emb') |
|| ($embstyle eq 'ssi')) { |
|| ($embstyle eq 'ssi')) { |
$turi='/adm/wrapper'.$turi; |
unless ($turi =~/\.page$/) { |
|
$turi='/adm/wrapper'.$turi; |
|
} |
} elsif ($turi!~/\.(sequence|page)$/) { |
} elsif ($turi!~/\.(sequence|page)$/) { |
$turi='/adm/coursedocs/showdoc'.$turi; |
$turi='/adm/coursedocs/showdoc'.$turi; |
} |
} |
} else { # normal internal resource |
} elsif ($turi=~/\S/) { # normal non-empty internal resource |
if (($embstyle eq 'img') || ($embstyle eq 'emb')) { |
my $mapdir=$uri; |
$turi='/adm/wrapper'.$turi; |
$mapdir=~s/[^\/]+$//; |
} |
$turi=&Apache::lonnet::hreflocation($mapdir,$turi); |
|
if (($embstyle eq 'img') || ($embstyle eq 'emb')) { |
|
$turi='/adm/wrapper'.$turi; |
|
} |
} |
} |
} |
} |
|
# Store reverse lookup, remove query string |
if (defined($hash{'ids_'.$turi})) { |
my $idsuri=$turi; |
$hash{'ids_'.$turi}.=','.$rid; |
$idsuri=~s/\?.+$//; |
|
if (defined($hash{'ids_'.$idsuri})) { |
|
$hash{'ids_'.$idsuri}.=','.$rid; |
} else { |
} else { |
$hash{'ids_'.$turi}=''.$rid; |
$hash{'ids_'.$idsuri}=''.$rid; |
} |
} |
|
|
if |
if |