Tidy up occupations

nigelhorne · Oct 10, 2023 · 9c87d9b · 9c87d9b
1 parent 6abcc72
commit 9c87d9b
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/gedcom b/gedcom
@@ -10452,15 +10452,21 @@ sub get_all_occupations
 			$occupations[0] = "Domestic $1";
 		}
 
+		$occupations[0] =~ s/^Formerly //i;
+		$occupations[0] =~ s/\sretired$//i;
+
 		if($occupations[0] =~ /works? on (.+)/i) {
 			$occupations[0] = "$1 worker";
 		} elsif(($occupations[0] eq 'Ag Lab') ||
 			($occupations[0] eq 'Ag Labourer') ||
 			($occupations[0] eq 'Ag Labourer Pauper') ||
+			($occupations[0] eq 'Ag Lab Pauper') ||
 			($occupations[0] eq 'Farm Labourer') ||
 			($occupations[0] eq 'Agricultural Farm Labourer') ||
 			($occupations[0] eq 'Ordinary Agricultural Labourer') ||
 			($occupations[0] eq 'work on farm') ||
+			($occupations[0] eq 'Agricultural Lab') ||
+			($occupations[0] eq 'Agril Laborer') ||
 			($occupations[0] eq 'Labourer (Ag)')) {
 			$occupations[0] = 'Agricultural Labourer';
 		} elsif($occupations[0] eq 'Poultry Farming') {