Small optimisation to 'both_sides'

nigelhorne · Jul 6, 2024 · e4f5000 · e4f5000
1 parent 94d60a9
commit e4f5000
Showing 1 changed file with 12 additions and 14 deletions.
diff --git a/ged2site b/ged2site
@@ -2514,7 +2514,6 @@ sub print_person
 
 		# Calculate the average age of adults death on both sides of the family
 		if($me && ((my $age = $age_at_death->years()) >= 20)) {
-			my $fr;
 			my $mr;
 			if(my $mother = $me->mother()) {
 				if($mr = $mother->relationship($person)) {
@@ -2523,21 +2522,20 @@ sub print_person
 				}
 			}
 			if(my $father = $me->father()) {
-				if($fr = $father->relationship($person)) {
+				if(my $fr = $father->relationship($person)) {
 					$facts->{'fathers_side'}->{'age'} += $age;
 					$facts->{'fathers_side'}->{'count'}++;
+					if($mr) {
+						# Keep a tally of the number of people appearing on both sides
+						push @{$facts->{'both_sides'}->{'xrefs'}}, $person->xref();
+						$facts->{'both_sides'}->{'count'}++;
+					}
 				}
 			}
-			if($mr && $fr) {
-				# Keep a tally of the number of people appearing on both sides
-				push @{$facts->{'both_sides'}->{'xrefs'}}, $person->xref();
-				$facts->{'both_sides'}->{'count'}++;
-			}
 		}
 	} elsif($yob && $yod) {
 		# Calculate the average age of adults death on both sides of the family
 		if($me && ((my $age = ($yod - $yob)) >= 20)) {
-			my $fr;
 			my $mr;
 			if(my $mother = $me->mother()) {
 				if($mr = $mother->relationship($person)) {
@@ -2546,16 +2544,16 @@ sub print_person
 				}
 			}
 			if(my $father = $me->father()) {
-				if($fr = $father->relationship($person)) {
+				if(my $fr = $father->relationship($person)) {
 					$facts->{'fathers_side'}->{'age'} += $age;
 					$facts->{'fathers_side'}->{'count'}++;
+					if($mr) {
+						# Keep a tally of the number of people appearing on both sides
+						push @{$facts->{'both_sides'}->{'xrefs'}}, $person->xref();
+						$facts->{'both_sides'}->{'count'}++;
+					}
 				}
 			}
-			if($mr && $fr) {
-				# Keep a tally of the number of people appearing on both sides
-				push @{$facts->{'both_sides'}->{'xrefs'}}, $person->xref();
-				$facts->{'both_sides'}->{'count'}++;
-			}
 		}
 	}