version 1.545, 2018/12/29 23:24:40
|
version 1.548, 2020/03/03 01:17:48
|
Line 1490 sub render {
|
Line 1490 sub render {
|
if ($args->{'iterator_map'}) { |
if ($args->{'iterator_map'}) { |
my $map = $args->{'iterator_map'}; |
my $map = $args->{'iterator_map'}; |
$map = $navmap->getResourceByUrl($map); |
$map = $navmap->getResourceByUrl($map); |
my $firstResource = $map->map_start(); |
if (ref($map)) { |
my $finishResource = $map->map_finish(); |
my $firstResource = $map->map_start(); |
|
my $finishResource = $map->map_finish(); |
$args->{'iterator'} = $it = $navmap->getIterator($firstResource, $finishResource, $filterHash, $condition); |
$args->{'iterator'} = $it = $navmap->getIterator($firstResource, $finishResource, $filterHash, $condition); |
|
} else { |
|
return; |
|
} |
} else { |
} else { |
$args->{'iterator'} = $it = $navmap->getIterator(undef, undef, $filterHash, $condition,undef,$args->{'include_top_level_map'}); |
$args->{'iterator'} = $it = $navmap->getIterator(undef, undef, $filterHash, $condition,undef,$args->{'include_top_level_map'}); |
} |
} |
Line 1828 END
|
Line 1831 END
|
} |
} |
} else { |
} else { |
my $deeplink = $navmap->get_mapparam(undef,$mapname,"0.deeplink"); |
my $deeplink = $navmap->get_mapparam(undef,$mapname,"0.deeplink"); |
if (($deeplink eq 'absent') || ($deeplink eq 'grades')) { |
if ($deeplink =~ /^(absent|grades),/) { |
if ($userCanSeeHidden) { |
if ($userCanSeeHidden) { |
$args->{'mapUnlisted'} = 1; |
$args->{'mapUnlisted'} = 1; |
} else { |
} else { |
Line 1899 END
|
Line 1902 END
|
} |
} |
} |
} |
# If deep-link parameter is set (and is not set to full) suppress link |
# If deep-link parameter is set (and is not set to full) suppress link |
# unless priviliged user, or calling context is sequence, and parameter |
# unless privileged user, or calling context is sequence, and parameter |
# set at map level |
# set at map level |
if ((!$curRes->deeplink($args->{'caller'})) || |
if ((!$curRes->deeplink($args->{'caller'})) || |
($curRes->deeplink($args->{'caller'}) eq 'full') || &advancedUser()) { |
($curRes->deeplink($args->{'caller'}) =~ /^full,/) || &advancedUser()) { |
$args->{'resource_nolink'} = 0; |
$args->{'resource_nolink'} = 0; |
} else { |
} else { |
$args->{'resource_nolink'} = 1; |
$args->{'resource_nolink'} = 1; |
Line 1985 END
|
Line 1988 END
|
$currentJumpDelta) { |
$currentJumpDelta) { |
# Jam the anchor after the <td> tag; |
# Jam the anchor after the <td> tag; |
# necessary for valid HTML (which Mozilla requires) |
# necessary for valid HTML (which Mozilla requires) |
$colHTML =~ s/\>/\>\<a name="curloc" \/\>/; |
$colHTML =~ s/\>/\>\<a name="curloc" \>\<\/a\>/; |
$displayedJumpMarker = 1; |
$displayedJumpMarker = 1; |
} |
} |
$result .= $colHTML . "\n"; |
$result .= $colHTML . "\n"; |
Line 5146 sub slot_control {
|
Line 5149 sub slot_control {
|
} |
} |
sub deeplink { |
sub deeplink { |
my ($self,$caller) = @_; |
my ($self,$caller) = @_; |
if ($caller eq 'sequence') { |
my $value = $self->parmval("deeplink"); |
my @deeplink = $self->parmval("deeplink"); |
if ($value) { |
if ($deeplink[1] eq 'resource') { |
my @deeplink = split(/,/,$value); |
return $deeplink[0]; |
if ($caller eq 'sequence') { |
|
if ($deeplink[1] ne 'res') { |
|
return; |
|
} |
} |
} |
} else { |
return $deeplink[0]; |
return $self->parmval("deeplink"); |
|
} |
} |
|
return; |
} |
} |
|
|
# Multiple things need this |
# Multiple things need this |