X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=import_ward_data;h=c04da9f10beb2f9a7a45d9eae9f902f3bfe693e5;hb=e5ddee51384dd75fd9611897ce92cb4e76e37952;hp=c45feafde8a73c6410877a57165a3674dc112522;hpb=7af932f11f7025c37945987840922f1786c4de5c;p=eq%2F.git

diff --git a/import_ward_data b/import_ward_data
index c45feaf..c04da9f 100755
--- a/import_ward_data
+++ b/import_ward_data
@@ -82,7 +82,7 @@ sub print_hash
 #+-------+--------------------+------+-----+---------+-------+
 sub update_eq_aaronic_table
 {
-    print "-> Updating eq_aaronic table\n";
+    print "\n-> Updating eq_aaronic table\n";
 
     # Set all records to be invalid. Only mark them as valid if they appear on the new list.
     $sth = $dbh->prepare("update eq_aaronic set valid=0");
@@ -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'};
@@ -137,7 +138,7 @@ sub update_eq_aaronic_table
 #+------------+------------------+------+-----+---------+-------+
 sub update_eq_elder_table
 {
-    print "-> Updating eq_elder table\n";
+    print "\n-> Updating eq_elder table\n";
 
     # Set all records to be invalid. Only mark them as valid if they appear on the new list.
     $sth = $dbh->prepare("update eq_elder set valid=0");
@@ -196,7 +197,7 @@ sub update_eq_elder_table
 #+--------------+------------------+------+-----+---------+-------+
 sub update_eq_calling_table()
 {
-    print "-> Updating eq_calling table\n";
+    print "\n-> Updating eq_calling table\n";
 
     #print "-> Organization Data Dump\n\n";
     #&print_hash(\%organization_data);
@@ -236,7 +237,7 @@ sub update_eq_district_table
 {
     # Districts should be created by hand. This subroutine only
     # updates the supervisor's ID in each district.
-    print "-> Updating eq_district table\n";
+    print "\n-> Updating eq_district table\n";
     $sth = $dbh->prepare("select * from eq_district");
     $sth->execute or die "-E- DB error: $DBI::errstr\n";
     while($sqlhashref = $sth->fetchrow_hashref) {
@@ -266,7 +267,7 @@ sub update_eq_district_table
 #+---------------+------------------+------+-----+---------+-------+
 sub update_eq_companionship_table
 {
-    print "-> Updating eq_companionship table\n";
+    print "\n-> Updating eq_companionship table\n";
 
     # First, mark all existing companionships as invalid in case they have been dissolved
     $sth = $dbh->prepare("update eq_companionship set valid=0");
@@ -353,7 +354,7 @@ sub update_eq_companionship_table
 #+---------------+------------------+------+-----+---------+-------+
 sub update_eq_family_table
 {
-    print "-> Updating eq_family table\n";
+    print "\n-> Updating eq_family table\n";
 
     # Set all records to be invalid. Only mark them as valid if they appear on the new list.
     $sth = $dbh->prepare("update eq_family set valid=0");
@@ -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 &&
@@ -437,7 +441,7 @@ sub update_eq_family_table
 #+----------+------------------+------+-----+---------+-------+
 sub update_eq_parent_table
 {
-    print "-> Updating eq_parent table\n";
+    print "\n-> Updating eq_parent table\n";
 
     # Set all records to be invalid. Only mark them as valid if they appear on the new list.
     $sth = $dbh->prepare("update eq_parent set valid=0");
@@ -522,7 +526,7 @@ sub update_eq_parent_table
 #+----------+------------------+------+-----+---------+-------+
 sub update_eq_child_table
 {
-    print "-> Updating eq_child table\n";
+    print "\n-> Updating eq_child table\n";
 
     # Set all records to be invalid. Only mark them as valid if they appear on the new list.
     $sth = $dbh->prepare("update eq_child set valid=0");
@@ -652,7 +656,7 @@ if(defined $opt_o) {
 # Process command line options
 if(defined $opt_n) { $datadir = $opt_n; }
 else { $datadir = shift(@ARGV); }
-print "-> Processing all ward data files in $datadir\n";
+print "\n-> Processing all ward data files in $datadir\n";
 
 ###################################################
 # Parse Ward Data Files