From 99ae34ba51677b09a7be97fd671db85bfede02a4 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Wed, 18 Sep 2013 11:33:07 -0300 Subject: [PATCH] Bug 10691: 5xx not properly linked by authid in authority search result list This patch changes the URL and data used to show the 'see from' and 'see also' links on the OPAC's authority search results page. Bonus points: makes some strings translatable. To test: - On your dev setup (master) create some authority records (i created personal name authorities). - Pick one of them and link 400$a to another one, do the same with 500$a - Make sure zebra is running and changes got indexed. - In the OPAC search for the authority that is linked to the others. - Check the 'see also:' link points to an authority search - Apply the patch - Reload/re-do the search - Check the 'see also:' link points to the authority id. Regards To+ Sponsored-by: Universidad Nacional de Cordoba --- .../en/includes/authorities-search-results.inc | 55 +++++++++++++----- .../en/modules/opac-authoritiessearchresultlist.tt | 61 ++++++++++---------- 2 files changed, 72 insertions(+), 44 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/authorities-search-results.inc b/koha-tmpl/opac-tmpl/prog/en/includes/authorities-search-results.inc index 6e6db3c..44c9e27 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/authorities-search-results.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/authorities-search-results.inc @@ -11,21 +11,35 @@ RT: [% heading | html %] [% END %] [% ELSE %] - [% IF ( label ) %][% label | html %][% END %] + + [% IF ( type=='seefrom' ) %] + used for/see from: + [% ELSIF ( type=='seealso' ) %] + see also: + [% END %] + - [% IF ( linkpath && search ) %][% heading | html %] - [% ELSE %][% heading | html %][% END %] + [% IF ( linkpath && search ) %] + [% heading | html %] + [% ELSE %] + [% heading | html %] + [% END %] - [% UNLESS ( type=='seefrom' || type=='seealso' ) %][% SWITCH type %] - [% CASE 'earlier' %](Earlier heading) - [% CASE 'later' %](Later heading) - [% CASE 'acronym' %](Acronym) - [% CASE 'musical' %](Musical composition) - [% CASE 'broader' %](Broader heading) - [% CASE 'narrower' %](Narrower heading) - [% CASE 'parent' %](Immediate parent body) - [% CASE %][% IF type %]([% type | html %])[% END %] - [% END %][% END %] + [% UNLESS ( type=='seefrom' || type=='seealso' ) %] + + [% SWITCH type %] + [% CASE 'earlier' %](Earlier heading) + [% CASE 'later' %](Later heading) + [% CASE 'acronym' %](Acronym) + [% CASE 'musical' %](Musical composition) + [% CASE 'broader' %](Broader heading) + [% CASE 'narrower' %](Narrower heading) + [% CASE 'parent' %](Immediate parent body) + [% CASE %][% IF type %]([% type | html %]) + [% END %] + [% END %] + + [% END %] [% END %] [% END %] [% BLOCK authresult %] @@ -65,14 +79,25 @@ [% IF ( summary.seefrom ) %] [% FOREACH seefro IN summary.seefrom %]
- [% PROCESS showreference heading=seefro.heading label="used for/see from:" type=seefro.type search='' %] + [% PROCESS showreference + heading=seefro.heading + type=seefro.type + search='' + authid=seefro.authid + %]
[% END %] [% END %] [% IF ( summary.seealso ) %] [% FOREACH seeals IN summary.seealso %]
- [% PROCESS showreference heading=seeals.heading label="see also:" type=seeals.type linkpath=link search=seeals.search %] + [% PROCESS showreference + heading=seeals.heading + type=seeals.type + linkpath=link + search=seeals.search + authid=seeals.authid + %]
[% END %] [% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt index 71ad40e..1bbaac5 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tt @@ -44,35 +44,38 @@ [% IF ( total ) %]
- - - - - [% UNLESS ( isEDITORS ) %] - - [% END %] - - - [% FOREACH resul IN result %] - [% UNLESS ( loop.odd ) %] - - [% ELSE %] - - [% END %] - - - [% UNLESS ( resul.isEDITORS ) %] - - [% END %] - - - [% END %] -
Authorized headingsType of headingBiblio recordsFull heading
[% PROCESS authresult summary=resul.summary link="/cgi-bin/koha/opac-authorities-home.pl?op=do_search&type=opac&operatorc=contains&marclistc=mainentry&and_orc=and&orderby=HeadingAsc&valuec=" %][% resul.authtype %] - [% resul.used %] biblios - - View full heading -
-
+ + + + + [% UNLESS ( isEDITORS ) %] + + [% END %] + + +[% FOREACH resul IN result %] + [% UNLESS ( loop.odd ) %] + + [% ELSE %] + + [% END %] + + + [% UNLESS ( resul.isEDITORS ) %] + + [% END %] + + +[% END %] +
Authorized headingsType of headingBiblio recordsFull heading
[% PROCESS authresult + summary=resul.summary + link="/cgi-bin/koha/opac-authoritiesdetail.pl?authid=" + %][% resul.authtype %] + [% resul.used %] biblios + + View full heading +
+
[% IF ( displayprev ) %] << -- 1.7.9.5