Skip to content

Commit e30abc5

Browse files
committed
Remove blank strings from the family hash
1 parent ff71d27 commit e30abc5

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

bin/extract

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ sub extract_family_info
109109
my @children = extract_names_from_phrase($raw);
110110
push @{$family{children}}, map { { name => $_, sex => 'M' } } @children;
111111
}
112-
if($text =~ /\sdaughter?,\s*(.+?)[;\.]/) {
112+
if($text =~ /\sdaughters?,\s*(.+?)[;\.]/) {
113113
my $raw = $1;
114114
$raw =~ s/\sand their .+//;
115115
my @children = extract_names_from_phrase($raw);
@@ -382,8 +382,11 @@ sub extract_family_info
382382

383383
# Remove empty arrays the family hash
384384
foreach my $key (keys %family) {
385-
if (ref($family{$key}) eq 'ARRAY' && @{$family{$key}} == 0) {
386-
delete $family{$key};
385+
if(ref($family{$key}) eq 'ARRAY') {
386+
$family{$key} = [ grep { /\S/ } @{$family{$key}} ];
387+
if(@{$family{$key}} == 0) {
388+
delete $family{$key};
389+
}
387390
}
388391
}
389392

gedcom

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13676,7 +13676,7 @@ sub extract_family_info
1367613676
my @children = extract_names_from_phrase($raw);
1367713677
push @{$family{children}}, map { { name => $_, sex => 'M' } } @children;
1367813678
}
13679-
if($text =~ /\sdaughter?,\s*(.+?)[;\.]/) {
13679+
if($text =~ /\sdaughters?,\s*(.+?)[;\.]/) {
1368013680
my $raw = $1;
1368113681
$raw =~ s/\sand their .+//;
1368213682
my @children = extract_names_from_phrase($raw);
@@ -13949,8 +13949,11 @@ sub extract_family_info
1394913949

1395013950
# Remove empty arrays the family hash
1395113951
foreach my $key (keys %family) {
13952-
if (ref($family{$key}) eq 'ARRAY' && @{$family{$key}} == 0) {
13953-
delete $family{$key};
13952+
if(ref($family{$key}) eq 'ARRAY') {
13953+
$family{$key} = [ grep { /\S/ } @{$family{$key}} ];
13954+
if(@{$family{$key}} == 0) {
13955+
delete $family{$key};
13956+
}
1395413957
}
1395513958
}
1395613959

0 commit comments

Comments
 (0)