version 1.546, 2019/01/16 20:23:37
|
version 1.549, 2020/03/05 16:45:36
|
Line 592 sub getLinkForResource {
|
Line 592 sub getLinkForResource {
|
my $anchor; |
my $anchor; |
if ($res->is_page()) { |
if ($res->is_page()) { |
foreach my $item (@$stack) { if (defined($item)) { $anchor = $item; } } |
foreach my $item (@$stack) { if (defined($item)) { $anchor = $item; } } |
$anchor=&escape($anchor->shown_symb()); |
if ($anchor->encrypted() && !&advancedUser()) { |
|
$anchor='LC_'.$anchor->id(); |
|
} else { |
|
$anchor=&escape($anchor->shown_symb()); |
|
} |
return ($res->link(),$res->shown_symb(),$anchor); |
return ($res->link(),$res->shown_symb(),$anchor); |
} |
} |
# in case folder was skipped over as "only sequence" |
# in case folder was skipped over as "only sequence" |
Line 1831 END
|
Line 1835 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 1902 END
|
Line 1906 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 1988 END
|
Line 1992 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 5149 sub slot_control {
|
Line 5153 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 |