More consistent handling of parents

Author: nigelhorne

bin/extract

@@ -152,12 +152,14 @@ sub extract_family_info
 
 	# Extract grandchildren
 	if(!$family{'grandchildren'}) {
-		my @grandchildren = split /\s*(?:,|and)\s*/i, ($text =~ /grandchildren\s+([^\.;]+)/i)[0];
-		if(scalar(@grandchildren)) {
-			$family{'grandchildren'} = [ map { { 'name' => $_ } } grep { defined $_ && $_ ne '' } @grandchildren ];
+		if($text =~ /grandchildren\s+([^\.;]+)/i) {
+			my @grandchildren = split /\s*(?:,|and)\s*/i, $1;
+			if(scalar(@grandchildren)) {
+				$family{'grandchildren'} = [ map { { 'name' => $_ } } grep { defined $_ && $_ ne '' } @grandchildren ];
+			}
 		}
 	}
-	if(scalar @{$family{grandchildren}}) {
+	if($family{'grandchildren'} && scalar @{$family{grandchildren}}) {
 		while((exists $family{'grandchildren'}->[0]) && (length($family{'grandchildren'}->[0]) == 0)) {
 			shift @{$family{'grandchildren'}};
 		}
@@ -248,6 +250,11 @@ sub extract_family_info
 			father => { name => $father },
 			mother => { name => $mother },
 		};
+	} elsif($text =~ /parents were (\w+) and (\w+)/i) {
+		$family{parents} = {
+			father => { name => $1 },
+			mother => { name => $2 },
+		};
 	}
 
 	# Extract spouse's death year and remove the "(year)" from the name

gedcom

@@ -13719,12 +13719,14 @@ sub extract_family_info
 
 	# Extract grandchildren
 	if(!$family{'grandchildren'}) {
-		my @grandchildren = split /\s*(?:,|and)\s*/i, ($text =~ /grandchildren\s+([^\.;]+)/i)[0];
-		if(scalar(@grandchildren)) {
-			$family{'grandchildren'} = [ map { { 'name' => $_ } } grep { defined $_ && $_ ne '' } @grandchildren ];
+		if($text =~ /grandchildren\s+([^\.;]+)/i) {
+			my @grandchildren = split /\s*(?:,|and)\s*/i, $1;
+			if(scalar(@grandchildren)) {
+				$family{'grandchildren'} = [ map { { 'name' => $_ } } grep { defined $_ && $_ ne '' } @grandchildren ];
+			}
 		}
 	}
-	if(scalar @{$family{grandchildren}}) {
+	if($family{'grandchildren'} && scalar @{$family{grandchildren}}) {
 		while((exists $family{'grandchildren'}->[0]) && (length($family{'grandchildren'}->[0]) == 0)) {
 			shift @{$family{'grandchildren'}};
 		}
@@ -13815,6 +13817,11 @@ sub extract_family_info
 			father => { name => $father },
 			mother => { name => $mother },
 		};
+	} elsif($text =~ /parents were (\w+) and (\w+)/i) {
+		$family{parents} = {
+			father => { name => $1 },
+			mother => { name => $2 },
+		};
 	}
 
 	# Extract spouse's death year and remove the "(year)" from the name