- foreach my $field ( $record->field( $auth_type->{auth_tag_to_report} ) ) {
- my @subfields_data;
- my @subf = $field->subfields;
-
- # loop through each subfield
- my %result;
- for my $i ( 0 .. $#subf ) {
- $subf[$i][0] = "@" unless $subf[$i][0];
- $result{ $subf[$i][0] } .= $subf[$i][1] . "|";
- }
- foreach ( keys %result ) {
- my %subfield_data;
- chop $result{$_};
- $subfield_data{marc_value} = $result{$_};
- $subfield_data{marc_subfield} = $_;
-
- # $subfield_data{marc_tag}=$field->tag();
- push( @subfields_data, \%subfield_data );
+ my @fields = $record->field( $auth_type->{auth_tag_to_report} );
+ my $repet = ($query->param('repet') || 1) - 1;
+ my $field = $fields[$repet];
+
+ # Get all values for each distinct subfield
+ my %subfields;
+ for ( $field->subfields ) {
+ next if $_->[0] == "9"; # $9 will be set with authid value
+ my $letter = $_->[0];
+ next if defined $subfields{$letter};
+ my @values = $field->subfield($letter);
+ $subfields{$letter} = \@values;
+ }
+
+ # Add all subfields to the subfield_loop
+ for( keys %subfields ) {
+ my $letter = $_ || '@';
+ push( @subfield_loop, {marc_subfield => $letter, marc_values => $subfields{$_}} );
+ }
+
+ push( @subfield_loop, { marc_subfield => 'w', marc_values => $relationship } ) if ( $relationship );
+ if (C4::Context->preference('marcflavour') eq 'UNIMARC') {
+ $indicator1 = $field->indicator('1');
+ $indicator2 = $field->indicator('2');
+ } elsif (C4::Context->preference('marcflavour') eq 'MARC21') {
+ my $tag_from = $auth_type->{auth_tag_to_report};
+ my $tag_to = $index;
+ $tag_to =~ s/^tag_(\d*)_.*$/$1/;
+ if ($tag_to =~ /^6/) { # subject heading
+ my %thes_mapping = qw / a 0
+ b 1
+ c 2
+ d 3
+ k 5
+ n 4
+ r 7
+ s 7
+ v 6
+ z 7
+ | 4 /;
+ my $thes_008_11 = '';
+ $thes_008_11 = substr($record->field('008')->data(), 11, 1) if $record->field('008')->data();
+ $indicator2 = defined $thes_mapping{$thes_008_11} ? $thes_mapping{$thes_008_11} : $thes_008_11;
+ if ($indicator2 eq '7') {
+ if ($thes_008_11 eq 'r') {
+ $subfields{'2'} = ['aat'];
+ } elsif ($thes_008_11 eq 's') {
+ $subfields{'2'} = ['sears'];
+ }
+ }