X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-MARCdetail.pl;h=51d1579be15f0983d395ba6e536164f00267f6f8;hb=529af6e044729156b9589775d35e6e46bda9a22a;hp=1d156917a4447cbfdbb2edaf6042403670e6e538;hpb=100e6a9808ead4ee8d951da59ead1550e75bb4c3;p=koha.git

diff --git a/opac/opac-MARCdetail.pl b/opac/opac-MARCdetail.pl
index 1d156917a4..51d1579be1 100755
--- a/opac/opac-MARCdetail.pl
+++ b/opac/opac-MARCdetail.pl
@@ -40,7 +40,6 @@ the items attached to the biblio
 =cut
 
 use strict;
-require Exporter;
 use C4::Auth;
 use C4::Context;
 use C4::Output;
@@ -56,8 +55,8 @@ my $dbh = C4::Context->dbh;
 
 my $biblionumber = $query->param('biblionumber');
 my $itemtype     = &GetFrameworkCode($biblionumber);
-my $tagslib      = &GetMarcStructure( $dbh, 0, $itemtype );
-
+my $tagslib      = &GetMarcStructure( 0, $itemtype );
+my $biblio = GetBiblioData($biblionumber);
 my $record = GetMarcBiblio($biblionumber);
 
 # open template
@@ -70,6 +69,14 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         debug           => 1,
     }
 );
+
+$template->param(
+    bibliotitle => $biblio->{title},
+);
+
+$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
+$template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) );
+
 # adding the $RequestOnOpac param
 my $RequestOnOpac;
 if (C4::Context->preference("RequestOnOpac")) {
@@ -123,7 +130,7 @@ for ( my $tabloop = 0 ; $tabloop <= 10 ; $tabloop++ ) {
         }
         else {
             my @subf = $fields[$x_i]->subfields;
-
+            my $previous;
             # loop through each subfield
             for my $i ( 0 .. $#subf ) {
                 $subf[$i][0] = "@" unless $subf[$i][0];
@@ -132,11 +139,13 @@ for ( my $tabloop = 0 ; $tabloop <= 10 ; $tabloop++ ) {
                     $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }->{tab}
                     ne $tabloop );
                 next
-                  if ( $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }
-                    ->{hidden} > 0 );
+                  if ( $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }->{hidden} > 0 ); 
                 my %subfield_data;
                 $subfield_data{marc_lib} =
-                  $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }->{lib};
+                                ($tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }->{lib} eq $previous) ?
+                                '--' :
+                                $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }->{lib};
+                $previous = $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }->{lib};
                 $subfield_data{link} =
                   $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }->{link};
                 $subf[$i][1] =~ s/\n/<br\/>/g;
@@ -151,7 +160,7 @@ for ( my $tabloop = 0 ; $tabloop <= 10 ; $tabloop++ ) {
                 {
 
 #                    warn " tag : ".$tagslib->{$fields[$x_i]->tag()}." subfield :".$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}. "ISBN : ".$subf[$i][1]."PosttraitementISBN :".DisplayISBN($subf[$i][1]);
-                    $subfield_data{marc_value} = DisplayISBN( $subf[$i][1] );
+                    $subfield_data{marc_value} = $subf[$i][1];
                 }
                 else {
                     if ( $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }
@@ -182,7 +191,10 @@ for ( my $tabloop = 0 ; $tabloop <= 10 ; $tabloop++ ) {
                 }
                 else {
                     $tag_data{tag} =
-                        $fields[$x_i]->tag() . ' -'
+                        $fields[$x_i]->tag() 
+                      . ' '
+                      . C4::Koha::display_marc_indicators($fields[$x_i])
+                      . ' - '
                       . $tagslib->{ $fields[$x_i]->tag() }->{lib};
                 }
             }
@@ -213,8 +225,10 @@ foreach my $field (@fields) {
     # loop through each subfield
     for my $i ( 0 .. $#subf ) {
         next if ( $tagslib->{ $field->tag() }->{ $subf[$i][0] }->{tab} ne 10 );
+		next if ( $tagslib->{ $field->tag() }->{ $subf[$i][0] }->{hidden} > 0 );
         $witness{ $subf[$i][0] } =
           $tagslib->{ $field->tag() }->{ $subf[$i][0] }->{lib};
+
         if ( $tagslib->{ $field->tag() }->{ $subf[$i][0] }->{isurl} ) {
             $this_row{ $subf[$i][0] } =
               "<a href=\"$subf[$i][1]\">$subf[$i][1]</a>";
@@ -222,7 +236,7 @@ foreach my $field (@fields) {
         elsif ( $tagslib->{ $field->tag() }->{ $subf[$i][0] }->{kohafield} eq
             "biblioitems.isbn" )
         {
-            $this_row{ $subf[$i][0] } = DisplayISBN( $subf[$i][1] );
+            $this_row{ $subf[$i][0] } = $subf[$i][1];
         }
         else {
             $this_row{ $subf[$i][0] } =
@@ -235,7 +249,7 @@ foreach my $field (@fields) {
     }
 }
 my ( $holdingbrtagf, $holdingbrtagsubf ) =
-  &GetMarcFromKohaField( $dbh, "items.holdingbranch", $itemtype );
+  &GetMarcFromKohaField( "items.holdingbranch", $itemtype );
 @big_array =
   sort { $a->{$holdingbrtagsubf} cmp $b->{$holdingbrtagsubf} } @big_array;