diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth-detail.tt
new file mode 100644
index 0000000000..2f438becf6
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth-detail.tt
@@ -0,0 +1,173 @@
+[% BLOCK authtypelabel %]
+ [% UNLESS ( type=='seefrom' || type=='seealso' || type=='' ) %]
+
[% FILTER trim %][% 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 %][% type %]
+ [% END %][% END %]
+ [% END %]
+[% END %]
+[% BLOCK otherscript %]
+ [% FOREACH heading IN headings %]
+ [% IF heading.category == wantcategory %]
+ [% IF heading.direction == 'ltr' %]
+
+ [% heading.term %]
+
+ [% ELSIF heading.direction == 'rtl' %]
+
+ [% heading.term %]
+
+ [% END %]
+ [% END %]
+ [% END %]
+[% END %]
+[% BLOCK authheadingdisplay %]
+ [% IF authid %]
[% heading %]
+ [% ELSIF search %]
[% heading %]
+ [% ELSE %][% heading %]
+ [% END %]
+[% END %]
+[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Entry
+[% INCLUDE 'doc-head-close.inc' %]
+[% IF ( displayhierarchy ) %]
+
+[% END %]
+
+
+
+
+
+
+[% INCLUDE 'masthead.inc' %]
+
+
+
+
+
+
+
+[% IF ( displayhierarchy ) %]
+
+
+[% FOREACH loophierarchie IN loophierarchies %]
+
+ [% FOREACH loopelemen IN loophierarchie.loopelement %]
+
+ [% IF ( loopelemen.current_value ) %]
+ [% loopelemen.value %]
+ [% ELSE %]
+
[% loopelemen.value %]
+ [% END %]
+ [% IF ( loopelemen.ifchildren ) %]
+
+
+ [% FOREACH loopchildre IN loopelemen.loopchildren %]
+
+ [% END %]
+ [% END %]
+
+ [% END %]
+
+
+[% END %]
+
+[% END %]
+
[% summary.mainentry %][% IF authtypetext %]([% authtypetext %])[% END %]
+
+
+[% FOREACH authorize IN summary.authorized %]
+
Preferred form: [% authorize.heading %]
+[% END %]
+[% PROCESS otherscript headings=summary.otherscript wantcategory='preferred' %]
+
+[% IF summary.seefrom.size %]
+
+
Used for/see from:
+
+ [% FOREACH seefro IN summary.seefrom %]
+
+ [% IF seefro.type && seefro.type != 'seefrom' %][% PROCESS authtypelabel type=seefro.type | trim %]: [% END %]
+ [% PROCESS authheadingdisplay heading=seefro.heading search=seefrosearch authid=seefro.authid %]
+
+ [% END %]
+ [% PROCESS otherscript headings=summary.otherscript wantcategory='seefrom' %]
+
+[% END %]
+[% IF summary.seealso.size %]
+
+
See also:
+
+ [% FOREACH seeals IN summary.seealso %]
+ [% IF seeals.type && seeals.type != 'seealso' %][% PROCESS authtypelabel type=seeals.type | trim %]: [% END %]
+ [% PROCESS authheadingdisplay heading=seeals.heading search=seeals.search authid=seeals.authid %]
+
+ [% END %]
+ [% PROCESS otherscript headings=summary.otherscript wantcategory='seealso' %]
+
+[% END %]
+[% IF marcflavour == 'UNIMARC' && summary.otherscript %]
+
+ [% FOREACH otherscrip IN summary.otherscript %]
+
See also[% PROCESS language lang=otherscript.lang | trim %] term:
+ [% otherscrip.term %]
+
+ [% END %]
+
+[% END %]
+
+
+
+
+[% FOREACH note IN summary.notes %]
+
[% note.note %]
+[% END %]
+
+
+
+
+
+
+
+
+
+[% IF ( OpacNav ) %]
+
+
+
[% END %]
+
+[% INCLUDE 'opac-bottom.inc' %]
diff --git a/opac/opac-authoritiesdetail.pl b/opac/opac-authoritiesdetail.pl
index 2884373bdb..278db999c7 100755
--- a/opac/opac-authoritiesdetail.pl
+++ b/opac/opac-authoritiesdetail.pl
@@ -53,7 +53,7 @@ my $query = new CGI;
my $dbh = C4::Context->dbh;
my $display_hierarchy = C4::Context->preference("AuthDisplayHierarchy");
-my $show_marc = $query->param('marc') || 1; # Currently only MARC view is available
+my $show_marc = $query->param('marc');
# open template
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -68,8 +68,6 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
my $authid = $query->param('authid');
my $authtypecode = &GetAuthTypeCode( $authid );
-my $tagslib = &GetTagsLabels( 0, $authtypecode );
-
my $record;
if ($display_hierarchy){
@@ -101,90 +99,92 @@ else {
}
my $count = CountUsage($authid);
-# find the marc field/subfield used in biblio by this authority
-my $sth =
- $dbh->prepare(
- "select distinct tagfield from marc_subfield_structure where authtypecode=?"
- );
-$sth->execute($authtypecode);
-my $biblio_fields;
-while ( my ($tagfield) = $sth->fetchrow ) {
- $biblio_fields .= $tagfield . "9,";
-}
-chop $biblio_fields;
-
-# fill arrays
-my @loop_data = ();
-my $tag;
-
-# loop through each tab 0 through 9
-# for (my $tabloop = 0; $tabloop<=10;$tabloop++) {
-# loop through each tag
-my @fields = $record->fields();
-foreach my $field (@fields) {
- my @subfields_data;
-
- # skip UNIMARC fields <200, they are useless for a patron
- next if C4::Context->preference('MarcFlavour') eq 'UNIMARC' && $field->tag() <200;
-
- # if tag <10, there's no subfield, use the "@" trick
- if ( $field->tag() < 10 ) {
- next if ( $tagslib->{ $field->tag() }->{'@'}->{hidden} );
- my %subfield_data;
- $subfield_data{marc_lib} = $tagslib->{ $field->tag() }->{'@'}->{lib};
- $subfield_data{marc_value} = $field->data();
- $subfield_data{marc_subfield} = '@';
- $subfield_data{marc_tag} = $field->tag();
- push( @subfields_data, \%subfield_data );
- }
- else {
- my @subf = $field->subfields;
-
- # loop through each subfield
- for my $i ( 0 .. $#subf ) {
- $subf[$i][0] = "@" unless $subf[$i][0];
- next if ( $tagslib->{ $field->tag() }->{ $subf[$i][0] }->{hidden} );
- # skip useless subfields (for patrons)
- next if $subf[$i][0] =~ /7|8|9/;
- my %subfield_data;
- $subfield_data{marc_lib} =
- $tagslib->{ $field->tag() }->{ $subf[$i][0] }->{lib};
- $subfield_data{marc_subfield} = $subf[$i][0];
- $subfield_data{marc_tag} = $field->tag();
- $subfield_data{isurl} = $tagslib->{ $field->tag() }->{ $subf[$i][0] }->{isurl};
- $subfield_data{marc_value} = $subf[$i][1];
- push( @subfields_data, \%subfield_data );
- }
- }
- if ( $#subfields_data >= 0 ) {
- my %tag_data;
- $tag_data{tag} =
- $field->tag()
- . ' '
- . C4::Koha::display_marc_indicators($field)
- . ' - ' . $tagslib->{ $field->tag() }->{lib};
- $tag_data{subfield} = \@subfields_data;
- push( @loop_data, \%tag_data );
- }
-}
-$template->param( "Tab0XX" => \@loop_data );
my $authtypes = getauthtypes();
my @authtypesloop = ();
foreach my $thisauthtype ( keys %{$authtypes} ) {
push @authtypesloop,
- { value => $thisauthtype,
- selected => $thisauthtype eq $authtypecode,
- authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
- };
+ { value => $thisauthtype,
+ selected => $thisauthtype eq $authtypecode,
+ authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
+ };
+}
+$template->{VARS}->{'authtypesloop'} = \@authtypesloop;
+$template->{VARS}->{'authtypetext'} = $authtypes->{$authtypecode}{'authtypetext'};
+$template->{VARS}->{'authid'} = $authid;
+$template->{VARS}->{'count'} = $count;
+
+# find the marc field/subfield used in biblio by this authority
+if ($show_marc) {
+ my $tagslib = &GetTagsLabels( 0, $authtypecode );
+ my $sth =
+ $dbh->prepare(
+ "select distinct tagfield from marc_subfield_structure where authtypecode=?"
+ );
+ $sth->execute($authtypecode);
+ my $biblio_fields;
+ while ( my ($tagfield) = $sth->fetchrow ) {
+ $biblio_fields .= $tagfield . "9,";
+ }
+ chop $biblio_fields;
+
+# fill arrays
+ my @loop_data = ();
+ my $tag;
+
+# loop through each tag
+ my @fields = $record->fields();
+ foreach my $field (@fields) {
+ my @subfields_data;
+
+# skip UNIMARC fields <200, they are useless for a patron
+ next if C4::Context->preference('MarcFlavour') eq 'UNIMARC' && $field->tag() <200;
+
+# if tag <10, there's no subfield, use the "@" trick
+ if ( $field->tag() < 10 ) {
+ next if ( $tagslib->{ $field->tag() }->{'@'}->{hidden} );
+ my %subfield_data;
+ $subfield_data{marc_lib} = $tagslib->{ $field->tag() }->{'@'}->{lib};
+ $subfield_data{marc_value} = $field->data();
+ $subfield_data{marc_subfield} = '@';
+ $subfield_data{marc_tag} = $field->tag();
+ push( @subfields_data, \%subfield_data );
+ }
+ else {
+ my @subf = $field->subfields;
+
+# loop through each subfield
+ for my $i ( 0 .. $#subf ) {
+ $subf[$i][0] = "@" unless $subf[$i][0];
+ next if ( $tagslib->{ $field->tag() }->{ $subf[$i][0] }->{hidden} );
+# skip useless subfields (for patrons)
+ next if $subf[$i][0] =~ /7|8|9/;
+ my %subfield_data;
+ $subfield_data{marc_lib} =
+ $tagslib->{ $field->tag() }->{ $subf[$i][0] }->{lib};
+ $subfield_data{marc_subfield} = $subf[$i][0];
+ $subfield_data{marc_tag} = $field->tag();
+ $subfield_data{isurl} = $tagslib->{ $field->tag() }->{ $subf[$i][0] }->{isurl};
+ $subfield_data{marc_value} = $subf[$i][1];
+ push( @subfields_data, \%subfield_data );
+ }
+ }
+ if ( $#subfields_data >= 0 ) {
+ my %tag_data;
+ $tag_data{tag} =
+ $field->tag()
+ . ' '
+ . C4::Koha::display_marc_indicators($field)
+ . ' - ' . $tagslib->{ $field->tag() }->{lib};
+ $tag_data{subfield} = \@subfields_data;
+ push( @loop_data, \%tag_data );
+ }
+ }
+ $template->param( "Tab0XX" => \@loop_data );
+} else {
+ my $summary = BuildSummary($record, $authid, $authtypecode);
+ $template->{VARS}->{'summary'} = $summary;
}
-$template->param(
- authid => $authid,
- count => $count,
- biblio_fields => $biblio_fields,
- authtypetext => $authtypes->{$authtypecode}{'authtypetext'},
- authtypesloop => \@authtypesloop,
-);
output_html_with_http_headers $query, $cookie, $template->output;