X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=opac%2Fopac-authoritiesdetail.pl;h=2884373bdbf49e339e22d708dfb8ca1a6e48204e;hb=07e30a78d306fbd395dbe510fb867ba31540388b;hp=066a821121e34679b099f6565c6fa4e61954617b;hpb=ce037a96eb173e300a564ca96415d8c8bbe304b9;p=koha.git

diff --git a/opac/opac-authoritiesdetail.pl b/opac/opac-authoritiesdetail.pl
index 066a821121..2884373bdb 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') || 1; # Currently only MARC view is available
 
 # 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,8 +66,13 @@ 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 (C4::Context->preference("AuthDisplayHierarchy")){
+if ($display_hierarchy){
   my $trees=BuildUnimarcHierarchies($authid);
   my @trees = split /;/,$trees ;
   push @trees,$trees unless (@trees);
@@ -88,7 +92,7 @@ if (C4::Context->preference("AuthDisplayHierarchy")){
     push @loophierarchies, { 'loopelement' =>\@loophierarchy};
   }
   $template->param(
-    'displayhierarchy' =>C4::Context->preference("AuthDisplayHierarchy"),
+    'displayhierarchy' => $display_hierarchy,
     'loophierarchies' =>\@loophierarchies,
   );
 }
@@ -145,15 +149,10 @@ foreach my $field (@fields) {
             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_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 );
         }
     }
@@ -168,18 +167,16 @@ foreach my $field (@fields) {
         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,
+$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'},
-    );
-    push @authtypesloop, \%row;
+      };
 }
 
 $template->param(
@@ -188,12 +185,6 @@ $template->param(
     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;