@@ -, +, @@ see also reference in the staff client and the OPAC. are now hyperlinks, which work. --- C4/AuthoritiesMarc.pm | 37 ++++++++++++++++--- .../en/includes/authorities-search-results.inc | 7 +++- .../en/modules/authorities/searchresultlist.tt | 2 +- .../en/includes/authorities-search-results.inc | 17 +++++---- .../en/modules/opac-authoritiessearchresultlist.tt | 2 +- 5 files changed, 48 insertions(+), 17 deletions(-) --- a/C4/AuthoritiesMarc.pm +++ a/C4/AuthoritiesMarc.pm @@ -948,7 +948,7 @@ sub BuildSummary { $summary{type} = $authref->{authtypetext}; $summary{summary} = $authref->{summary}; } - my $marc21subfields = 'abcdfghjklmnopqrstuvxyz'; + my $marc21subfields = 'abcdfghjklmnopqrstuvxyz68'; my %marc21controlrefs = ( 'a' => 'earlier', 'b' => 'later', 'd' => 'acronym', @@ -1027,11 +1027,26 @@ sub BuildSummary { # see : foreach my $field ($record->field('5..')) { if (($field->subfield('5')) && ($field->subfield('a')) && ($field->subfield('5') eq 'g')) { - push @seealso, { $field->as_string('abcdefgjxyz'), type => 'broader' }; + push @seealso, { + heading => $field->as_string('abcdefgjxyz'), + type => 'broader', + search => $field->as_string('abcdefgjxyz'), + authid => $field->subfield('9') + }; } elsif (($field->subfield('5')) && ($field->as_string) && ($field->subfield('5') eq 'h')){ - push @seealso, { heading => $field->as_string('abcdefgjxyz'), type => 'narrower' }; + push @seealso, { + heading => $field->as_string('abcdefgjxyz'), + type => 'narrower', + search => $field->as_string('abcdefgjxyz'), + authid => $field->subfield('9') + }; } elsif ($field->subfield('a')) { - push @seealso, { heading => $field->as_string('abcdefgxyz'), type => 'seealso' }; + push @seealso, { + heading => $field->as_string('abcdefgxyz'), + type => 'seealso', + search => $field->as_string('abcdefgjxyz'), + authid => $field->subfield('9') + }; } } # // form @@ -1090,9 +1105,19 @@ sub BuildSummary { my $type = 'seealso'; $type = $marc21controlrefs{substr $field->subfield('w'), '0'} if ($field->subfield('w')); if ($type eq 'subfi') { - push @seealso, { heading => $field->as_string($marc21subfields), type => $field->subfield('i') }; + push @seealso, { + heading => $field->as_string($marc21subfields), + type => $field->subfield('i'), + search => $field->as_string($marc21subfields), + authid => $field->subfield('9') + }; } else { - push @seealso, { heading => $field->as_string($marc21subfields), type => $type }; + push @seealso, { + heading => $field->as_string($marc21subfields), + type => $type, + search => $field->as_string($marc21subfields), + authid => $field->subfield('9') + }; } } foreach my $field ($record->field('6..')) { --- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc @@ -14,7 +14,10 @@ [% END %] [% ELSE %] [% IF ( label ) %][% label %][% END %] - [% heading %] + + [% IF ( linkpath && search ) %][% heading %] + [% ELSE %][% heading %][% END %] + [% UNLESS ( type=='seefrom' || type=='seealso' ) %][% SWITCH type %] [% CASE 'earlier' %](Earlier heading) [% CASE 'later' %](Later heading) @@ -50,7 +53,7 @@ [% IF ( summary.seealso ) %] [% FOREACH seeals IN summary.seealso %]
- [% PROCESS showreference heading=seeals.heading label="see also:" type=seeals.type %] + [% PROCESS showreference heading=seeals.heading label="see also:" type=seeals.type linkpath=link search=seeals.search %]
[% END %] [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt @@ -64,7 +64,7 @@ function searchauthority() { [% ELSE %] [% END %] - [% PROCESS authresult summary=resul.summary %] + [% PROCESS authresult summary=resul.summary link="/cgi-bin/koha/authorities/authorities-home.pl?op=do_search&type=intranet&marclist=any&operator=contains&orderby=HeadingAsc&value=" %] Details [% UNLESS ( resul.isEDITORS ) %] --- a/koha-tmpl/opac-tmpl/prog/en/includes/authorities-search-results.inc +++ a/koha-tmpl/opac-tmpl/prog/en/includes/authorities-search-results.inc @@ -14,7 +14,10 @@ [% END %] [% ELSE %] [% IF ( label ) %][% label %][% END %] - [% heading %] + + [% IF ( linkpath && search ) %][% heading %] + [% ELSE %][% heading %][% END %] + [% UNLESS ( type=='seefrom' || type=='seealso' ) %][% SWITCH type %] [% CASE 'earlier' %](Earlier heading) [% CASE 'later' %](Later heading) @@ -27,30 +30,30 @@ [% END %] [% END %] [% BLOCK authresult %] - [% IF ( summary.summary ) %][% summary.summary %]:[% END %] + [% IF ( summary.summary ) %][% summary.summary | html %]:[% END %] [% UNLESS ( summary.summaryonly ) %] [% FOREACH authorize IN summary.authorized %] - [% authorize %] + [% authorize | html %] [% END %] [% IF ( marcflavour == 'UNIMARC' ) %] [% FOREACH note IN summary.notes %] - [% note %] + [% note | html %] [% END %] [% FOREACH seefro IN summary.seefrom %] - [% PROCESS showreference heading=seefro.heading label="" type=seefro.type %] + [% PROCESS showreference heading=seefro.heading label="" type=seefro.type | html %] [% END %] [% ELSE %] [% IF ( summary.seefrom ) %] [% FOREACH seefro IN summary.seefrom %]
- [% PROCESS showreference heading=seefro.heading label="used for/see from:" type=seefro.type %] + [% PROCESS showreference heading=seefro.heading label="used for/see from:" type=seefro.type search='' | html %]
[% END %] [% END %] [% IF ( summary.seealso ) %] [% FOREACH seeals IN summary.seealso %]
- [% PROCESS showreference heading=seeals.heading label="see also:" type=seeals.type %] + [% PROCESS showreference heading=seeals.heading label="see also:" type=seeals.type linkpath=link search=seeals.search | html %]
[% END %] [% END %] --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt +++ a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt @@ -57,7 +57,7 @@ [% ELSE %] [% END %] - [% PROCESS authresult summary=resul.summary %] + [% PROCESS authresult summary=resul.summary link="/cgi-bin/koha/opac-authorities-home.pl?op=do_search&type=opac&operator=contains&marclist=any&and_ora=and&orderby=HeadingAsc&value=" %] [% authtypetext %] [% UNLESS ( resul.isEDITORS ) %] --