From faa43031e66d1544aa2c93befa3f849ba93806d7 Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Tue, 23 Jul 2013 23:03:31 +0000 Subject: [PATCH] Bug 9755: (follow-up) tweak test for tag visibility in merge hash Koha's MARC framework structure doesn't assign tags to tabs in the cataloging editor; only subfields are assigned to tabs, and the field as a whole follows the subfields. Consequently, for the purpoase of calculating a merge hash, a field should be added either if no MARC framework information is passed (which signals that the caller wants to deal with the entire MARC record) or if any of its subfields are assigned to visible tabs. This patch has the effect of getting rid of the following spurious warnings from the Apache log: merge.pl: Argument "" isn't numeric in numeric ge (>=) at /home/gmc/koha/Koha/Util/MARC.pm line 78 Signed-off-by: Galen Charlton --- Koha/Util/MARC.pm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Koha/Util/MARC.pm b/Koha/Util/MARC.pm index e8ec1259ea..fc3c9f247c 100644 --- a/Koha/Util/MARC.pm +++ b/Koha/Util/MARC.pm @@ -75,8 +75,7 @@ sub createMergeHash { } - if ( ( !defined($tagslib) || $tagslib->{$fieldtag}->{'tab'} >= 0 ) - && @subfield_array ) + if ( !defined($tagslib) || @subfield_array ) { push @array, { -- 2.39.5