View | Details | Raw Unified | Return to bug 5202
Collapse All | Expand All

(-)a/Koha/Util/MARC.pm (-4 / +15 lines)
Lines 62-69 sub createMergeHash { Link Here
62
            my @subfields = $field->subfields();
62
            my @subfields = $field->subfields();
63
            my @subfield_array;
63
            my @subfield_array;
64
            foreach my $subfield (@subfields) {
64
            foreach my $subfield (@subfields) {
65
                if ( !defined($tagslib)
65
                if (
66
                    || $tagslib->{$fieldtag}->{ @$subfield[0] }->{'tab'} >= 0 )
66
                    !defined($tagslib)
67
                    || (   defined $tagslib->{$fieldtag}
68
                        && defined $tagslib->{$fieldtag}->{ @$subfield[0] }
69
                        && defined $tagslib->{$fieldtag}->{ @$subfield[0] }->{'tab'}
70
                        && $tagslib->{$fieldtag}->{ @$subfield[0] }->{'tab'} >= 0 )
71
                  )
67
                {
72
                {
68
                    push @subfield_array,
73
                    push @subfield_array,
69
                      {
74
                      {
Lines 75-82 sub createMergeHash { Link Here
75
80
76
            }
81
            }
77
82
78
            if ( ( !defined($tagslib) || $tagslib->{$fieldtag}->{'tab'} >= 0 )
83
            if (
79
                && @subfield_array )
84
                (
85
                    !defined($tagslib) || ( defined $tagslib->{$fieldtag}
86
                        && defined $tagslib->{$fieldtag}->{'tab'}
87
                        && $tagslib->{$fieldtag}->{'tab'} >= 0 )
88
                )
89
                && @subfield_array
90
              )
80
            {
91
            {
81
                push @array,
92
                push @array,
82
                  {
93
                  {
(-)a/authorities/merge.pl (-1 / +5 lines)
Lines 114-119 else { Link Here
114
114
115
            # Getting MARC Structure
115
            # Getting MARC Structure
116
            my $tagslib = GetTagsLabels( 1, $framework );
116
            my $tagslib = GetTagsLabels( 1, $framework );
117
            foreach my $field ( keys %$tagslib ) {
118
                if ( defined $tagslib->{$field}->{'tab'} && $tagslib->{$field}->{'tab'} eq ' ' ) {
119
                    $tagslib->{$field}->{'tab'} = 0;
120
                }
121
            }
117
122
118
            my $notreference =
123
            my $notreference =
119
              ( $authid[0] == $mergereference )
124
              ( $authid[0] == $mergereference )
120
- 

Return to bug 5202