- 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 );
- }
- if ( $#subfields_data >= 0 ) {
- my %tag_data;
- $tag_data{tag} = $field->tag() . ' -' . $tagslib->{ $field->tag() }->{lib};
- $tag_data{subfield} = \@subfields_data;
- push( @loop_data, \%tag_data );
- }
+ my $auth = Koha::Authorities->find( $authid );
+ my $authtypecode = $auth ? $auth->authtypecode : q{};
+ my $auth_type = Koha::Authority::Types->find($authtypecode);
+ my $record = GetAuthority($authid);
+ 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 and add to subfield loop
+ my %done_subfields;
+ for ( $field->subfields ) {
+ next if $_->[0] eq '9'; # $9 will be set with authid value
+ my $letter = $_->[0];
+ $letter ||= '@';
+ next if defined $done_subfields{$letter};
+ my @values = $field->subfield($letter);
+ push @subfield_loop, {marc_subfield => $letter, marc_values => \@values };
+ $done_subfields{$letter} = 1;
+ }
+
+ push( @subfield_loop, { marc_subfield => 'w', marc_values => $relationship } ) if ( $relationship );
+
+ my $controlled_ind = $auth->controlled_indicators({ record => $record, biblio_tag => $tag_number });
+ $indicator1 = $controlled_ind->{ind1};
+ $indicator2 = $controlled_ind->{ind2};
+ if( defined $controlled_ind->{sub2} ) {
+ my $v = $controlled_ind->{sub2};
+ push @subfield_loop, { marc_subfield => '2', marc_values => [ $v ] };