Fixed bug related to preferred name mismatches with hometeaching family name.

[eq/.git] / import_ward_data

diff --git a/import_ward_data b/import_ward_data
index c45feafde8a73c6410877a57165a3674dc112522..da23ae4ed07291314712423e04d0b63c31301fac 100755 (executable)
--- a/import_ward_data
+++ b/import_ward_data
@@ -93,7 +93,8 @@ sub update_eq_aaronic_table
        $hashref = $membership_data{$index};
        foreach $key (keys %$hashref) {
            if($key =~ /Priesthood/i &&
-              ($membership_data{$index}{$key} =~ /^Teacher\s*$/i ||
+              ($membership_data{$index}{$key} =~ /^Deacon\s*$/i ||
+               $membership_data{$index}{$key} =~ /^Teacher\s*$/i ||
                $membership_data{$index}{$key} =~ /^Priest\s*$/i)) {
                $aaronic_name = $membership_data{$index}{'Preferred Name'};
                $phone = $membership_data{$index}{'Phone 1'};
@@ -400,8 +401,11 @@ sub update_eq_family_table
                    $hashref = $hometeaching_data{$index};
                    foreach $key (keys %$hashref) {
                        if($hometeaching_data{$index}{'Household'} =~ /(\S+)\s+(\S+),\s+(\S+)\s+(.*)/) {
-                           print "I: Adjusting hometeaching match from: $hometeaching_data{$index}{'Household'} to $1, $3 $4\n";
-                           $hometeaching_data{$index}{'Household'} = "$1, $3 $4";
+                           $a = $1; $b = $2; $c = $3; $d = $4;
+                           if($family_name =~ /$a/ && $hometeaching_data{$index}{'Household'} !~ /$family_name/i) { 
+                               print "I: Adjusting hometeaching match from: $hometeaching_data{$index}{'Household'} to $a, $c $d\n";
+                               $hometeaching_data{$index}{'Household'} = "$a, $c $d";
+                           }
                        }
                        if($key =~ /Quorum/i &&
                           $hometeaching_data{$index}{$key} =~ /Elders/i &&