version 1.89, 2005/04/07 06:56:27
|
version 1.94, 2005/07/14 21:30:24
|
Line 73 sub versiontrack {
|
Line 73 sub versiontrack {
|
|
|
sub putinversion { |
sub putinversion { |
my $uri=shift; |
my $uri=shift; |
|
my $key=$env{'request.course.id'}.'_'.&Apache::lonnet::clutter($uri); |
if ($hash{'version_'.$uri}) { |
if ($hash{'version_'.$uri}) { |
my $version=$hash{'version_'.$uri}; |
my $version=$hash{'version_'.$uri}; |
if ($version eq 'mostrecent') { return $uri; } |
if ($version eq 'mostrecent') { return $uri; } |
Line 81 sub putinversion {
|
Line 82 sub putinversion {
|
{ return $uri; } |
{ return $uri; } |
$uri=~s/\.(\w+)$/\.$version\.$1/; |
$uri=~s/\.(\w+)$/\.$version\.$1/; |
} |
} |
|
&Apache::lonnet::do_cache_new('courseresversion',$key,&Apache::lonnet::declutter($uri),600); |
return $uri; |
return $uri; |
} |
} |
|
|
Line 126 sub loadmap {
|
Line 128 sub loadmap {
|
# Successfully got file, parse it |
# Successfully got file, parse it |
|
|
my $parser = HTML::TokeParser->new(\$instr); |
my $parser = HTML::TokeParser->new(\$instr); |
|
#$parser->attr_encoded(1); |
my $token; |
my $token; |
|
|
my $linkpc=0; |
my $linkpc=0; |
Line 138 sub loadmap {
|
Line 141 sub loadmap {
|
if ($token->[0] eq 'S') { |
if ($token->[0] eq 'S') { |
if ($token->[1] eq 'resource') { |
if ($token->[1] eq 'resource') { |
# -------------------------------------------------------------------- Resource |
# -------------------------------------------------------------------- Resource |
|
if ($token->[2]->{'type'} eq 'zombie') { next; } |
my $rid=$lpc.'.'.$token->[2]->{'id'}; |
my $rid=$lpc.'.'.$token->[2]->{'id'}; |
|
|
$hash{'kind_'.$rid}='res'; |
$hash{'kind_'.$rid}='res'; |
Line 338 sub traceroute {
|
Line 341 sub traceroute {
|
my ($mapid,$resid)=split(/\./,$rid); |
my ($mapid,$resid)=split(/\./,$rid); |
my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$hash{'src_'.$rid}); |
my $symb=&Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},$resid,$hash{'src_'.$rid}); |
my $hidden=&Apache::lonnet::EXT('resource.0.hiddenresource',$symb); |
my $hidden=&Apache::lonnet::EXT('resource.0.hiddenresource',$symb); |
if ($hdnflag || lc($hidden) eq 'yes') { $hiddenurl{$rid}=1; } |
|
|
if ($hdnflag || lc($hidden) eq 'yes') { |
|
$hiddenurl{$rid}=1; |
|
} |
|
if (!$hdnflag && lc($hidden) eq 'no') { |
|
delete($hiddenurl{$rid}); |
|
} |
|
|
my $encrypt=&Apache::lonnet::EXT('resource.0.encrypturl',$symb); |
my $encrypt=&Apache::lonnet::EXT('resource.0.encrypturl',$symb); |
if ($encflag || lc($encrypt) eq 'yes') { $encurl{$rid}=1; } |
if ($encflag || lc($encrypt) eq 'yes') { $encurl{$rid}=1; } |
if (($retfurl eq '') && ($hash{'src_'.$rid}) |
if (($retfurl eq '') && ($hash{'src_'.$rid}) |
Line 581 sub readmap {
|
Line 591 sub readmap {
|
} |
} |
# ----------------------------------------------- Close hashes to finally store |
# ----------------------------------------------- Close hashes to finally store |
# --------------------------------- Routine must pass this point, no early outs |
# --------------------------------- Routine must pass this point, no early outs |
|
$hash{'first_url'}=$retfurl; |
unless ((untie(%hash)) && (untie(%parmhash))) { |
unless ((untie(%hash)) && (untie(%parmhash))) { |
&Apache::lonnet::logthis("<font color=blue>WARNING: ". |
&Apache::lonnet::logthis("<font color=blue>WARNING: ". |
"Could not untie coursemap $fn for $uri.</font>"); |
"Could not untie coursemap $fn for $uri.</font>"); |