From a704a5ea37cc11a6a3ec3e9add11d36ec713bb41 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 15 Sep 2025 16:30:49 +0200 Subject: [PATCH] Bug 40559: cleanup --- catalogue/MARCdetail.pl | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/catalogue/MARCdetail.pl b/catalogue/MARCdetail.pl index 7316b5434de..b1b36962244 100755 --- a/catalogue/MARCdetail.pl +++ b/catalogue/MARCdetail.pl @@ -184,30 +184,23 @@ for ( my $tabloop = 0 ; $tabloop <= 10 ; $tabloop++ ) { # loop through each subfield for my $i ( 0 .. $#subf ) { $subf[$i][0] = "@" unless defined $subf[$i][0]; + my $sf = $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }; next - if ( $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }->{tab} // q{} ) ne - $tabloop; # Note: defaulting to '0' changes behavior! + if ( $sf->{tab} // q{} ) ne $tabloop; # Note: defaulting to '0' changes behavior! next - if ( $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }->{hidden} =~ /-7|-4|-3|-2|2|3|5|8/ ); + if ( $sf->{hidden} =~ /-7|-4|-3|-2|2|3|5|8/ ); my %subfield_data; - $subfield_data{short_desc} = $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }->{lib}; - $subfield_data{long_desc} = - $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }->{lib}; - $subfield_data{link} = - $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }->{link}; - - # warn "tag : ".$tagslib->{$fields[$x_i]->tag()}." subfield :".$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}."lien koha? : "$subfield_data{link}; - if ( $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }->{isurl} ) { + $subfield_data{short_desc} = $sf->{lib}; + $subfield_data{long_desc} = $sf->{lib}; + $subfield_data{link} = $sf->{link}; + + if ( $sf->{isurl} ) { $subfield_data{marc_value} = $subf[$i][1]; $subfield_data{is_url} = 1; - } elsif ( $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }->{kohafield} - && $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }->{kohafield} eq "biblioitems.isbn" ) - { - - # 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]); + } elsif ( $sf->{kohafield} && $sf->{kohafield} eq "biblioitems.isbn" ) { $subfield_data{marc_value} = $subf[$i][1]; } else { - if ( $tagslib->{ $fields[$x_i]->tag() }->{ $subf[$i][0] }->{authtypecode} ) { + if ( $sf->{authtypecode} ) { $subfield_data{authority} = $fields[$x_i]->subfield(9); } $subfield_data{marc_value} = GetAuthorisedValueDesc( -- 2.34.1