X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-authoritiesdetail.pl;h=3e17cf18a95ac18134001775c87d5f2c7ca81006;hb=568f32606c2c9c247b2b477193a2d6814f738fa6;hp=7e06310c3da015b59f18170cb9923263f9529d4e;hpb=a8222aeeb1169d7b1939d1e64c319a16e3846e8c;p=koha.git

diff --git a/opac/opac-authoritiesdetail.pl b/opac/opac-authoritiesdetail.pl
index 7e06310c3d..3e17cf18a9 100755
--- a/opac/opac-authoritiesdetail.pl
+++ b/opac/opac-authoritiesdetail.pl
@@ -52,14 +52,13 @@ my $query = new CGI;
 
 my $dbh = C4::Context->dbh;
 
-my $authid       = $query->param('authid');
-my $authtypecode = &GetAuthTypeCode( $authid );
-my $tagslib      = &GetTagsLabels( 1, $authtypecode );
+my $display_hierarchy = C4::Context->preference("AuthDisplayHierarchy");
+my $show_marc = $query->param('marc');
 
 # open template
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "opac-authoritiesdetail.tmpl",
+        template_name   => $show_marc ? "opac-auth-MARCdetail.tt" : "opac-auth-detail.tt",
         query           => $query,
         type            => "opac",
         authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
@@ -67,128 +66,111 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-my $record;
-if (C4::Context->preference("AuthDisplayHierarchy")){
-  my $trees=BuildUnimarcHierarchies($authid);
-  my @trees = split /;/,$trees ;
-  push @trees,$trees unless (@trees);
-  my @loophierarchies;
-  foreach my $tree (@trees){
-    my @tree=split /,/,$tree;
-    push @tree,$tree unless (@tree);
-    my $cnt=0;
-    my @loophierarchy;
-    foreach my $element (@tree){
-      my $cell;
-      my $elementdata = GetAuthority($element);
-      $record= $elementdata if ($authid==$element);
-      push @loophierarchy, BuildUnimarcHierarchy($elementdata,"child".$cnt, $authid);
-      $cnt++;
-    }
-    push @loophierarchies, { 'loopelement' =>\@loophierarchy};
-  }
-  $template->param(
-    'displayhierarchy' =>C4::Context->preference("AuthDisplayHierarchy"),
-    'loophierarchies' =>\@loophierarchies,
-  );
+my $authid = $query->param('authid');
+$authid = int($authid);
+my $record = GetAuthority( $authid );
+if ( ! $record ) {
+    print $query->redirect("/cgi-bin/koha/errors/404.pl"); # escape early
+    exit;
 }
-else {
-    $record = GetAuthority( $authid );
+
+my $authtypecode = &GetAuthTypeCode( $authid );
+
+if ($display_hierarchy){
+    $template->{VARS}->{'displayhierarchy'} = $display_hierarchy;
+    $template->{VARS}->{'loophierarchies'} = GenerateHierarchy($authid);
 }
+
 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,";
+
+my $authtypes     = getauthtypes();
+my @authtypesloop = ();
+foreach my $thisauthtype ( keys %{$authtypes} ) {
+    push @authtypesloop,
+         { value        => $thisauthtype,
+           selected     => $thisauthtype eq $authtypecode,
+           authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
+         };
 }
-chop $biblio_fields;
+$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;
+    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;
-
-    # 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;
+    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;
 
-        # 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} );
+# 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() }->{ $subf[$i][0] }->{lib};
-            if ( $tagslib->{ $field->tag() }->{ $subf[$i][0] }->{isurl} ) {
-                $subfield_data{marc_value} =
-                  "<a href=\"$subf[$i][1]\">$subf[$i][1]</a>";
-            }
-            else {
-                $subfield_data{marc_value} = $subf[$i][1];
-            }
-            $subfield_data{marc_subfield} = $subf[$i][0];
+            $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 );
         }
+        elsif ( C4::Context->preference('marcflavour') eq 'MARC21' && $field->tag() eq 667 ) {
+            # tagfield 667 is a nonpublic general note in MARC21, which shouldn't be shown in the OPAC
+        }
+        else {
+            my @subf = $field->subfields;
+
+# loop through each subfield
+            for my $i ( 0 .. $#subf ) {
+                $subf[$i][0] = "@" unless defined $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 );
+        }
     }
-    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( "0XX" => \@loop_data );
-
-my $authtypes = getauthtypes;
-my @authtypesloop;
-foreach my $thisauthtype ( keys %$authtypes ) {
-    my $selected = 1 if $thisauthtype eq $authtypecode;
-    my %row = (
-        value        => $thisauthtype,
-        selected     => $selected,
-        authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
-    );
-    push @authtypesloop, \%row;
+    $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,
-    LibraryName          => C4::Context->preference("LibraryName"),
-    OpacNav              => C4::Context->preference("OpacNav"),
-    opaccredits          => C4::Context->preference("opaccredits"),
-    opacsmallimage       => C4::Context->preference("opacsmallimage"),
-    opaclayoutstylesheet => C4::Context->preference("opaclayoutstylesheet"),
-    opaccolorstylesheet  => C4::Context->preference("opaccolorstylesheet"),
-);
 output_html_with_http_headers $query, $cookie, $template->output;
-