Bug 5202: QA follow-up: quiet warnings

Due to massively incorrect data in the default authority frameworks,
we were getting warnings about undefined values and spaces from checking
which tab subfields/fields were displayed in. This patch eliminates those
warnings.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>

diff --git a/Koha/Util/MARC.pm b/Koha/Util/MARC.pm
index 500ba53..5d026ee 100644 (file)
--- a/Koha/Util/MARC.pm
+++ b/Koha/Util/MARC.pm
@@ -62,8 +62,13 @@ sub createMergeHash {
             my @subfields = $field->subfields();
             my @subfield_array;
             foreach my $subfield (@subfields) {
-                if ( !defined($tagslib)
-                    || $tagslib->{$fieldtag}->{ @$subfield[0] }->{'tab'} >= 0 )
+                if (
+                    !defined($tagslib)
+                    || (   defined $tagslib->{$fieldtag}
+                        && defined $tagslib->{$fieldtag}->{ @$subfield[0] }
+                        && defined $tagslib->{$fieldtag}->{ @$subfield[0] }->{'tab'}
+                        && $tagslib->{$fieldtag}->{ @$subfield[0] }->{'tab'} >= 0 )
+                  )
                 {
                     push @subfield_array,
                       {
@@ -75,7 +80,14 @@ sub createMergeHash {
 
             }
 
-            if ( !defined($tagslib) || @subfield_array )
+            if (
+                (
+                    !defined($tagslib) || ( defined $tagslib->{$fieldtag}
+                        && defined $tagslib->{$fieldtag}->{'tab'}
+                        && $tagslib->{$fieldtag}->{'tab'} >= 0 )
+                )
+                && @subfield_array
+              )
             {
                 push @array,
                   {

diff --git a/authorities/merge.pl b/authorities/merge.pl
index 0e3fb6d..3d4b881 100755 (executable)
--- a/authorities/merge.pl
+++ b/authorities/merge.pl
@@ -114,6 +114,11 @@ else {
 
             # Getting MARC Structure
             my $tagslib = GetTagsLabels( 1, $framework );
+            foreach my $field ( keys %$tagslib ) {
+                if ( defined $tagslib->{$field}->{'tab'} && $tagslib->{$field}->{'tab'} eq ' ' ) {
+                    $tagslib->{$field}->{'tab'} = 0;
+                }
+            }
 
             my $notreference =
               ( $authid[0] == $mergereference )