removed tc_parent, tc_child, and tc_aaronic tables, moved required info into tc_indiv...
[eq/.git] / bin / import_ward_data
index b42a7550b3d585bd27179593c2e1d41b3cc380c2..97823c43a4fbe7cac26982707491f360b6c7a2ef 100755 (executable)
@@ -102,67 +102,6 @@ sub print_hash
 
 ######################################################################
 
-# 3RD_AARONIC
-#+-------+--------------------+------+-----+---------+-------+
-#| Field | Type               | Null | Key | Default | Extra |
-#+-------+--------------------+------+-----+---------+-------+
-#| aaronic | int(16) unsigned |      | PRI | 0       |   A   |
-#| name    | varchar(60)      | YES  |     | NULL    |       |
-#| phone   | varchar(12)      | YES  |     | NULL    |       |
-#| email   | varchar(120)     | YES  |     | NULL    |       |
-#| valid   | tinyint(1)       | YES  |     | NULL    |       |
-#+-------+--------------------+------+-----+---------+-------+
-sub update_3rd_aaronic_table
-{
-    print "\n-> Updating 3rd_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 3rd_aaronic set valid=0");
-    $sth->execute or die "-E- DB error: $DBI::errstr\n";
-    
-    foreach $index (keys %membership_data)
-    {
-       $hashref = $membership_data{$index};
-       foreach $key (keys %$hashref) {
-           if($key =~ /Priesthood/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}{'Household Phone'};
-               if($phone =~ /(\d\d\d-\d\d\d\d)/) { $phone = "$areacode-$1"; }
-               if($phone =~ /^\(\d\d\d\) (\d\d\d-\d\d\d\d)/) { $phone = "$1-$2"; }
-               $email = $membership_data{$index}{'Individual E-mail'};
-               if ($email eq "") { $email = $membership_data{$index}{'Household E-mail'}; }
-               $sth = $dbh->prepare("select * from 3rd_aaronic where name='$aaronic_name'");
-               $sth->execute or die "-E- DB error: $DBI::errstr\n";
-               my @data = ();
-               while($sqlhashref = $sth->fetchrow_hashref) { push(@data, $sqlhashref); }
-               my $rows = scalar @data;
-               if($rows == 0) {
-                   # No existing records found for this aaronic, make a new entry
-                   print "   Adding new Aaronic: $aaronic_name\n";
-                   $sth = $dbh->prepare("insert into 3rd_aaronic values (NULL,'$aaronic_name','$phone','$email',1)");
-                   $sth->execute or die "-E- DB error: $DBI::errstr\n";
-               } elsif($rows == 1) {
-                   # An existing record was found for this aaronic, update it, mark it valid!
-                   print "   Updating existing aaronic: $aaronic_name\n";
-                   $sth = $dbh->prepare("update 3rd_aaronic set phone='$phone' where name='$aaronic_name'");
-                   $sth->execute or die "-E- DB error: $DBI::errstr\n";
-                   $sth = $dbh->prepare("update 3rd_aaronic set email='$email' where name='$aaronic_name'");
-                   $sth->execute or die "-E- DB error: $DBI::errstr\n";
-                   $sth = $dbh->prepare("update 3rd_aaronic set valid=1 where name='$aaronic_name'");
-                   $sth->execute or die "-E- DB error: $DBI::errstr\n";
-               } else {
-                   # More than one record was found. Error! This shouldn't happen.
-                   print "   -E- More than one record found ($rows) for aaronic name: $aaronic_name\n";
-               }
-           }
-       }
-    }
-    $sth->finish();
-}
-
 # 3RD_INDIV
 #+-------------+------------------+------+-----+---------+----------------+
 #| Field       | Type             | Null | Key | Default | Extra          |
@@ -180,88 +119,85 @@ sub update_3rd_aaronic_table
 #| attending   | tinyint(1)       | YES  |     | 0       |                |
 #| valid       | tinyint(1)       | YES  |     | NULL    |                |
 #+-------------+------------------+------+-----+---------+----------------+
-sub update_3rd_indiv_table
+sub update_tc_indiv_table
 {
-    print "\n-> Updating 3rd_indiv table\n";
+    print "\n-> Updating tc_indiv table\n";
 
     # Set all records to be invalid. Only mark them as valid if they appear on the new list.
-    $sth = $dbh->prepare("update 3rd_indiv set valid=0");
+    $sth = $dbh->prepare("update tc_indiv set valid=0");
     $sth->execute or die "-E- DB error: $DBI::errstr\n";
     
     foreach $index (keys %membership_data)
     {
        $hashref = $membership_data{$index};
-       foreach $key (keys %$hashref) {
-           if($key =~ /Priesthood/i && 
-              ($membership_data{$index}{$key} =~ /Deacon/i ||
-               $membership_data{$index}{$key} =~ /Teacher/i ||
-               $membership_data{$index}{$key} =~ /Priest/i ||
-               $membership_data{$index}{$key} =~ /Elder/i ||
-               $membership_data{$index}{$key} =~ /Unordained/i)) {
-               
-               # check if this is a prospective elder under the stewardship of the EQ
-               if($membership_data{$index}{$key} !~ /Elder/i) {
-                       $found = 0;
-                       foreach $i (keys %prospective_elder_data) {
-                               #print "$membership_data{$index}{'Full Name'}\n";
-                               #print "$prospective_elder_data{$i}{'Full Name'}\n";
-                               if($membership_data{$index}{'Full Name'} eq $prospective_elder_data{$i}{'Full Name'}) {
-                                       $found = 1;
-                                       last;
-                               }
-                       }
-                       if($found == 0) { next;}
-               }
-               
-               $id = $membership_data{$index}{'Indiv ID'};
-               $indiv_name = $membership_data{$index}{'Preferred Name'};
-               $phone = $membership_data{$index}{'Household Phone'};
-               $priesthood = $membership_data{$index}{'Priesthood'};
-               $organization = $organization_by_id{$id};
-               $attending = 0;
-               if(($organization =~ /Elders/) ||
-                  ($organization =~ /Young Men/) ||
-                  ($organization =~ /Sunday School/) ||
-                  ($organization =~ /Primary/)
-                  ) { $attending = 1; }
-               if($phone =~ /(\d\d\d-\d\d\d\d)/) { $phone = "$areacode-$1"; }
-               if($phone =~ /^\(\d\d\d\) (\d\d\d-\d\d\d\d)/) { $phone = "$1-$2"; }
-               $email = $membership_data{$index}{'indiv E-mail'};
-               if ($email eq "") { $email = $membership_data{$index}{'Household E-mail'}; }
-               $sth = $dbh->prepare("select * from 3rd_indiv where name='$indiv_name'");
-               $sth->execute or die "-E- DB error: $DBI::errstr\n";
-               my @data = ();
-               while($sqlhashref = $sth->fetchrow_hashref) { push(@data, $sqlhashref); }
-               my $rows = scalar @data;
-               if($rows == 0) {
-                   # No existing records found for this indiv, make a new entry
-                   print "   Adding new indiv: $indiv_name\n";
-                   $sth = $dbh->prepare("insert into 3rd_indiv values (NULL,'$id','$indiv_name','$phone','$email','$priesthood','n','1','','1','',$attending,1)");
-                   $sth->execute or die "-E- DB error: $DBI::errstr\n";
-               } elsif($rows == 1) {
-                   # An existing record was found for this indiv, update it
-                   print "   Updating existing indiv: $indiv_name\n";
-                   $sth = $dbh->prepare("update 3rd_indiv set valid=1 where name='$indiv_name'");
-                   $sth->execute or die "-E- DB error: $DBI::errstr\n";
-                   if($phone ne "") { 
-                       $sth = $dbh->prepare("update 3rd_indiv set phone='$phone' where name='$indiv_name'");
-                   } else {
-                       $sth = $dbh->prepare("update 3rd_indiv set phone=NULL where name='$indiv_name'");
-                   }
-                   $sth->execute or die "-E- DB error: $DBI::errstr\n";
-                   $sth = $dbh->prepare("update 3rd_indiv set attending='$attending' where name='$indiv_name'");
-                   $sth->execute or die "-E- DB error: $DBI::errstr\n";
-                   $sth = $dbh->prepare("update 3rd_indiv set indiv_id='$id' where name='$indiv_name'");
-                   $sth->execute or die "-E- DB error: $DBI::errstr\n";
-                   $sth = $dbh->prepare("update 3rd_indiv set priesthood='$priesthood' where name='$indiv_name'");
-                   $sth->execute or die "-E- DB error: $DBI::errstr\n";
-                   $sth = $dbh->prepare("update 3rd_indiv set email='$email' where name='$indiv_name'");
-                   $sth->execute or die "-E- DB error: $DBI::errstr\n";
-               } else {
-                   # More than one record was found. Error! This shouldn't happen.
-                   print "   -E- More than one record found ($rows) for indiv: $indiv_name\n";
-               }
+       $id = $membership_data{$index}{'Indiv ID'};
+       $indiv_name = $membership_data{$index}{'Preferred Name'};
+       $birthday = $membership_data{$index}{'Birth'};
+       $birthday =~ /(\d+) (\S+) (\d+)/; $day=$1; $month=$monthname2num{$2}; $year=$3;
+       $address = $membership_data{$index}{'Street 1'};
+       if($membership_data{$index}{'Street 2'} ne "") { 
+           $address .= " " . $membership_data{$index}{'Street 2'};
+       }
+       $phone = $membership_data{$index}{'Household Phone'};
+       $priesthood = $membership_data{$index}{'Priesthood'};
+       $hhposition = $membership_data{$index}{'HH Position'};
+       $organization = $organization_by_id{$id};
+       $attending = 0;
+       if(($organization =~ /Elders/) ||
+          ($organization =~ /Young Men/) ||
+          ($organization =~ /Sunday School/) ||
+          ($organization =~ /Primary/)
+          ) { $attending = 1; }
+       if($phone =~ /(\d\d\d-\d\d\d\d)/) { $phone = "$areacode-$1"; }
+       if($phone =~ /^\(\d\d\d\) (\d\d\d-\d\d\d\d)/) { $phone = "$1-$2"; }
+       $email = $membership_data{$index}{'indiv E-mail'};
+       if ($email eq "") { $email = $membership_data{$index}{'Household E-mail'}; }
+       $sth = $dbh->prepare("select * from tc_indiv where name=\"$indiv_name\"");
+       $sth->execute or die "-E- DB error: $DBI::errstr\n";
+       my @data = ();
+       while($sqlhashref = $sth->fetchrow_hashref) { push(@data, $sqlhashref); }
+       my $rows = scalar @data;
+       if($rows == 0) {
+           # No existing records found for this indiv, make a new entry
+           print "   Adding new indiv: $indiv_name\n";
+           $sth = $dbh->prepare("insert into tc_indiv values (NULL,'$id',\"$indiv_name\",'$year-$month-$day','$address','$phone','$email','','$hhposition','$priesthood','1','','1','',$attending,1)");
+           $sth->execute or die "-E- DB error: $DBI::errstr\n";
+       } elsif($rows == 1) {
+           # An existing record was found for this indiv, update it
+           print "   Updating existing indiv: $indiv_name\n";
+           $sth = $dbh->prepare("update tc_indiv set valid=1 where name=\"$indiv_name\"");
+           $sth->execute or die "-E- DB error: $DBI::errstr\n";
+           if($phone ne "") { 
+               $sth = $dbh->prepare("update tc_indiv set phone='$phone' where name=\"$indiv_name\"");
+           } else {
+               $sth = $dbh->prepare("update tc_indiv set phone=NULL where name=\"$indiv_name\"");
+           }
+           $sth->execute or die "-E- DB error: $DBI::errstr\n";
+           if($birthday ne "") { 
+               $sth = $dbh->prepare("update tc_indiv set birthday='$year-$month-$day' where name=\"$indiv_name\"");
+           } else {
+               $sth = $dbh->prepare("update tc_indiv set birthday=NULL where name=\"$indiv_name\"");
+           }
+           $sth->execute or die "-E- DB error: $DBI::errstr\n";
+           if($address ne "") { 
+               $sth = $dbh->prepare("update tc_indiv set address='$address' where name=\"$indiv_name\"");
+           } else {
+               $sth = $dbh->prepare("update tc_indiv set address=NULL where name=\"$indiv_name\"");
            }
+           $sth->execute or die "-E- DB error: $DBI::errstr\n";
+           $sth = $dbh->prepare("update tc_indiv set attending='$attending' where name=\"$indiv_name\"");
+           $sth->execute or die "-E- DB error: $DBI::errstr\n";
+           $sth = $dbh->prepare("update tc_indiv set indiv_id='$id' where name=\"$indiv_name\"");
+           $sth->execute or die "-E- DB error: $DBI::errstr\n";
+           $sth = $dbh->prepare("update tc_indiv set priesthood='$priesthood' where name=\"$indiv_name\"");
+           $sth->execute or die "-E- DB error: $DBI::errstr\n";
+           $sth = $dbh->prepare("update tc_indiv set email='$email' where name=\"$indiv_name\"");
+           $sth->execute or die "-E- DB error: $DBI::errstr\n";
+           $sth = $dbh->prepare("update tc_indiv set hh_position='$hhposition' where name=\"$indiv_name\"");
+           $sth->execute or die "-E- DB error: $DBI::errstr\n";
+       } else {
+           # More than one record was found. Error! This shouldn't happen.
+           print "   -E- More than one record found ($rows) for indiv: $indiv_name\n";
        }
     }
     $sth->finish();
@@ -278,16 +214,16 @@ sub update_3rd_indiv_table
 #| sequence     | int(16) unsigned | YES  |     | NULL    |       |
 #| sustained    | date             | YES  |     | NULL    |       |
 #+--------------+------------------+------+-----+---------+-------+
-sub update_3rd_calling_table()
+sub update_tc_calling_table()
 {
-    print "\n-> Updating 3rd_calling table\n";
+    print "\n-> Updating tc_calling table\n";
 
     #print "-> Organization Data Dump\n\n";
     #&print_hash(\%organization_data);
     
     # Delete all records from the calling table. We have no history to
     # save here. Just re-populate with the latest calling information.
-    $sth = $dbh->prepare("delete from 3rd_calling ");
+    $sth = $dbh->prepare("delete from tc_calling ");
     $sth->execute or die "-E- DB error: $DBI::errstr\n";
     
     foreach $index (keys %organization_data)
@@ -304,7 +240,7 @@ sub update_3rd_calling_table()
        $sustained =~ /(\S+) (\d+)/; $month=$1; $year=$2;
        if($name eq "") { next; }
        print "   Adding new Calling: $name -> $position\n";
-       $sth = $dbh->prepare("insert into 3rd_calling values ('$indiv_id','$name','$organization','$position','$sequence','$month $year')");
+       $sth = $dbh->prepare("insert into tc_calling values ('$indiv_id','$name','$organization','$position','$sequence','$month $year')");
        $sth->execute or die "-E- DB error: $DBI::errstr\n";
     }
 }
@@ -318,22 +254,22 @@ sub update_3rd_calling_table()
 #| supervisor | int(16) unsigned | YES  |     | NULL    |       |
 #| valid      | tinyint(1)       | YES  |     | NULL    |       |
 #+------------+------------------+------+-----+---------+-------+
-sub update_3rd_district_table
+sub update_tc_district_table
 {
     # Districts should be created by hand. This subroutine only
     # updates the supervisor's ID in each district.
-    print "\n-> Updating 3rd_district table\n";
-    $sth = $dbh->prepare("select * from 3rd_district");
+    print "\n-> Updating tc_district table\n";
+    $sth = $dbh->prepare("select * from tc_district");
     $sth->execute or die "-E- DB error: $DBI::errstr\n";
     while($sqlhashref = $sth->fetchrow_hashref) {
        $supervisor_name = $sqlhashref->{name};
        $district = $sqlhashref->{district};
-       $sth2 = $dbh->prepare("select * from 3rd_indiv where name='$supervisor_name'");
+       $sth2 = $dbh->prepare("select * from tc_indiv where name='$supervisor_name'");
        $sth2->execute or die "-E- DB error: $DBI::errstr\n";
        $sqlhashref2 = $sth2->fetchrow_hashref;
        $supervisor_id = $sqlhashref2->{indiv};
        $sth2->finish();
-       $sth2 = $dbh->prepare("update 3rd_district set supervisor='$supervisor_id' where district='$district'");
+       $sth2 = $dbh->prepare("update tc_district set supervisor='$supervisor_id' where district='$district'");
        $sth2->execute or die "-E- DB error: $DBI::errstr\n";
        $sth2->finish();
     }
@@ -346,19 +282,15 @@ sub update_3rd_district_table
 #+---------------+------------------+------+-----+---------+-------+
 #| companionship | int(16) unsigned |      |     | 0       |       |
 #| indiv         | int(16) unsigned | YES  |     | NULL    |       |
-#| aaronic       | int(16) unsigned | YES  |     | NULL    |       |
 #| district      | int(16) unsigned | YES  |     | NULL    |       |
 #| valid         | tinyint(1)       | YES  |     | NULL    |       |
 #+---------------+------------------+------+-----+---------+-------+
-sub update_3rd_companionship_table
+sub update_tc_companionship_table
 {
-    print "\n-> Updating 3rd_companionship table\n";
+    print "\n-> Updating tc_companionship table\n";
 
     # First, mark all existing companionships as invalid in case they have been dissolved
-    $sth = $dbh->prepare("update 3rd_companionship set valid=0");
-    $sth->execute or die "-E- DB error: $DBI::errstr\n";
-    # Second, mark all the aaronic invalid. We'll only mark the ones as valid that are assigned to hometeach
-    $sth = $dbh->prepare("update 3rd_aaronic set valid=0");
+    $sth = $dbh->prepare("update tc_companionship set valid=0");
     $sth->execute or die "-E- DB error: $DBI::errstr\n";
     
     foreach $index (keys %hometeaching_data)
@@ -369,22 +301,13 @@ sub update_3rd_companionship_table
                foreach $field ("Home Teacher 1","Home Teacher 2") {
                    $indiv_name = $hometeaching_data{$index}{$field};
                    if($indiv_name eq "") { next; }
-                   $sth2 = $dbh->prepare("select * from 3rd_indiv where name='$indiv_name'");
+                   $sth2 = $dbh->prepare("select * from tc_indiv where name='$indiv_name'");
                    $sth2->execute or die "-E- DB error: $DBI::errstr\n";
                    $sqlhashref2 = $sth2->fetchrow_hashref;
                    $indiv = $sqlhashref2->{indiv};
-                   $aaronic = "NULL";
-                   if($indiv eq "") {
-                       $sth2 = $dbh->prepare("select * from 3rd_aaronic where name='$indiv_name'");
-                       $sth2->execute or die "-E- DB error: $DBI::errstr\n";
-                       $sqlhashref2 = $sth2->fetchrow_hashref;
-                       $aaronic = $sqlhashref2->{aaronic};
-                       $indiv = "NULL";
-                       if($aaronic eq "") { print "-W- Unable to find $indiv_name in 3rd_indiv or 3rd_aaronic tables\n"; next; }
-                   } 
                    $id = $hometeaching_data{$index}{'Comp ID'};
                    $district = $hometeaching_data{$index}{'HT District'};
-                   $sth = $dbh->prepare("select * from 3rd_companionship where indiv='$indiv' and aaronic='$aaronic' and companionship='$id'");
+                   $sth = $dbh->prepare("select * from tc_companionship where indiv='$indiv' and companionship='$id'");
                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                    my @data = ();
                    while($sqlhashref = $sth->fetchrow_hashref) { push(@data, $sqlhashref); }
@@ -392,31 +315,19 @@ sub update_3rd_companionship_table
                    if($rows == 0) {
                        # No existing records found for this companionship, make a new entry
                        print "   Adding Companion to companionship: $indiv_name -> $id\n";
-                       $sth = $dbh->prepare("insert into 3rd_companionship values ($id,'$indiv','$aaronic','$district',1)");
+                       $sth = $dbh->prepare("insert into tc_companionship values ($id,'$indiv','$district',1)");
                        $sth->execute or die "-E- DB error: $DBI::errstr\n";
                    } else {
                        # An existing companionship was found for this companionship, update it
-                       $sth2 = $dbh->prepare("select * from 3rd_companionship where district='$district' and companionship='$id'");
+                       $sth2 = $dbh->prepare("select * from tc_companionship where district='$district' and companionship='$id'");
                        $sth2->execute or die "-E- DB error: $DBI::errstr\n";
-                       if($indiv ne "NULL") {
-                           print "   Updating Companionship with indiv: $indiv_name ($indiv) -> $id\n";
-                           $sth = $dbh->prepare("update 3rd_companionship set district='$district' where indiv='$indiv' and companionship='$id'");
-                           $sth->execute or die "-E- DB error 'district': $DBI::errstr\n";
-                           $sth = $dbh->prepare("update 3rd_companionship set indiv='$indiv' where indiv='$indiv' and companionship='$id'");
-                           $sth->execute or die "-E- DB error 'indiv': $DBI::errstr\n";
-                           $sth = $dbh->prepare("update 3rd_companionship set valid=1 where indiv='$indiv' and companionship='$id'");
-                           $sth->execute or die "-E- DB error 'valid': $DBI::errstr\n";
-                       } else {
-                           print "   Updating Companionship with Aaronic: $indiv_name ($aaronic) -> $id\n";
-                           $sth = $dbh->prepare("update 3rd_companionship set district='$district' where aaronic='$aaronic' and companionship='$id'");
-                           $sth->execute or die "-E- DB error: $DBI::errstr\n";
-                           $sth = $dbh->prepare("update 3rd_companionship set aaronic='$aaronic' where aaronic='$aaronic' and companionship='$id'");
-                           $sth->execute or die "-E- DB error: $DBI::errstr\n";
-                           $sth = $dbh->prepare("update 3rd_companionship set valid=1 where aaronic='$aaronic' and companionship='$id'");
-                           $sth->execute or die "-E- DB error: $DBI::errstr\n";                            
-                           $sth = $dbh->prepare("update 3rd_aaronic set valid=1 where aaronic='$aaronic'");
-                           $sth->execute or die "-E- DB error: $DBI::errstr\n";
-                       }
+                       print "   Updating Companionship with indiv: $indiv_name ($indiv) -> $id\n";
+                       $sth = $dbh->prepare("update tc_companionship set district='$district' where indiv='$indiv' and companionship='$id'");
+                       $sth->execute or die "-E- DB error 'district': $DBI::errstr\n";
+                       $sth = $dbh->prepare("update tc_companionship set indiv='$indiv' where indiv='$indiv' and companionship='$id'");
+                       $sth->execute or die "-E- DB error 'indiv': $DBI::errstr\n";
+                       $sth = $dbh->prepare("update tc_companionship set valid=1 where indiv='$indiv' and companionship='$id'");
+                       $sth->execute or die "-E- DB error 'valid': $DBI::errstr\n";
                    }
                    $sth->finish();
                    $sth2->finish();                
@@ -440,14 +351,14 @@ sub update_3rd_companionship_table
 #| visit_notes   | varchar(128)     | YES  |     | NULL    |       |
 #| valid         | tinyint(1)       | YES  |     | NULL    |       |
 #+---------------+------------------+------+-----+---------+-------+
-sub update_3rd_family_table
+sub update_tc_family_table
 {
-    print "\n-> Updating 3rd_family table\n";
+    print "\n-> Updating tc_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 3rd_family set valid=0");
+    $sth = $dbh->prepare("update tc_family set valid=0");
     $sth->execute or die "-E- DB error: $DBI::errstr\n";
-    $sth = $dbh->prepare("update 3rd_family set companionship=0");
+    $sth = $dbh->prepare("update tc_family set companionship=0");
     $sth->execute or die "-E- DB error: $DBI::errstr\n";
     
     foreach $index (keys %membership_data)
@@ -461,7 +372,7 @@ sub update_3rd_family_table
                $name_id = uc($family_name);
 
                # Find out how many families match this family's name
-               $sth = $dbh->prepare("select * from 3rd_family where name_id='$name_id'");
+               $sth = $dbh->prepare("select * from tc_family where name_id='$name_id'");
                $sth->execute or die "-E- DB error: $DBI::errstr\n";
                my @data = ();
                while($sqlhashref = $sth->fetchrow_hashref) { push(@data, $sqlhashref); }
@@ -470,14 +381,14 @@ sub update_3rd_family_table
                if($rows == 0) {
                    # No existing records found for this family, make a new entry
                    print "   Adding new Family: $family_name\n";
-                   $sth = $dbh->prepare("insert into 3rd_family values (NULL,$id,'$family_name','$name_id','0','0','1','',1)");
+                   $sth = $dbh->prepare("insert into tc_family values (NULL,$id,'$family_name','$name_id','0','0','1','',1)");
                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                } elsif($rows == 1) {
                    # An existing record was found for this family, update it
                    print "   Updating existing family: $family_name\n";
-                   $sth = $dbh->prepare("update 3rd_family set hofh_id=$id where name_id='$name_id'");
+                   $sth = $dbh->prepare("update tc_family set hofh_id=$id where name_id='$name_id'");
                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
-                   $sth = $dbh->prepare("update 3rd_family set valid=1 where name_id='$name_id'");
+                   $sth = $dbh->prepare("update tc_family set valid=1 where name_id='$name_id'");
                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                } else {
                    # More than one record was found. Error! This shouldn't happen.
@@ -485,12 +396,12 @@ sub update_3rd_family_table
                }
 
                 # Now update the indiv_id field for this family
-               $sth = $dbh->prepare("select * from 3rd_indiv WHERE name='$family_name'");
+               $sth = $dbh->prepare("select * from tc_indiv WHERE name='$family_name'");
                $sth->execute or die "-E- DB error: $DBI::errstr\n";
                while($sqlhashref = $sth->fetchrow_hashref) {
                    $indiv_id = $sqlhashref->{indiv};
                    print "   Updating family indiv_id: $family_name -> $indiv_id\n";
-                   $sth = $dbh->prepare("update 3rd_family set indiv_id=$indiv_id where name_id='$name_id'");
+                   $sth = $dbh->prepare("update tc_family set indiv_id=$indiv_id where name_id='$name_id'");
                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                }
                
@@ -514,7 +425,7 @@ sub update_3rd_family_table
                        {
                            print "   Updating hometeaching assignment for $family_name family\n";
                            $companionship = $hometeaching_data{$index}{'Comp ID'};
-                           $sth = $dbh->prepare("update 3rd_family set companionship='$companionship' where name_id='$name_id'");
+                           $sth = $dbh->prepare("update tc_family set companionship='$companionship' where name_id='$name_id'");
                            $sth->execute or die "-E- DB error: $DBI::errstr\n";
                        }
                    }
@@ -525,171 +436,6 @@ sub update_3rd_family_table
     }
 }
 
-# 3RD_PARENT
-#+----------+------------------+------+-----+---------+-------+
-#| Field    | Type             | Null | Key | Default | Extra |
-#+----------+------------------+------+-----+---------+-------+
-#| parent   | int(16) unsigned |      | PRI | 0       |   A   |
-#| family   | int(16) unsigned | YES  |     | NULL    |       |
-#| name     | varchar(30)      | YES  |     | NULL    |       |
-#| birthday | date             | YES  |     | NULL    |       |
-#| phone    | varchar(12)      | YES  |     | NULL    |       |
-#| address  | varchar(255)     | YES  |     | NULL    |       |
-#| indiv_id | int(16) unsigned | YES  | UNI | NULL    |       |
-#| valid    | tinyint(1)       | YES  |     | NULL    |       |
-#+----------+------------------+------+-----+---------+-------+
-sub update_3rd_parent_table
-{
-    print "\n-> Updating 3rd_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 3rd_parent set valid=0");
-    $sth->execute or die "-E- DB error: $DBI::errstr\n";
-    
-    foreach $index (keys %membership_data)
-    {
-       $hashref = $membership_data{$index};
-       foreach $key (keys %$hashref) {
-           if($key =~ /HH Position/i &&
-              $membership_data{$index}{$key} =~ /Head of Household/i ||
-              $membership_data{$index}{$key} =~ /Spouse/i
-              ) {
-               # Get some information from the hash about this parent
-               $parent_name = $membership_data{$index}{'Preferred Name'};
-               $parent_name =~ s/\'/\\'/g; #'
-               $birthday = $membership_data{$index}{'Birth'};
-               $birthday =~ /(\d+) (\S+) (\d+)/; $day=$1; $month=$monthname2num{$2}; $year=$3;
-               $hofh_id = $membership_data{$index}{'HofH ID'};
-               $id = $membership_data{$index}{'Indiv ID'};
-               $phone = $membership_data{$index}{'Household Phone'};
-               if($phone =~ /(\d\d\d-\d\d\d\d)/) { $phone = "$areacode-$1"; }
-               if($phone =~ /^\(\d\d\d\) (\d\d\d-\d\d\d\d)/) { $phone = "$1-$2"; }
-               $address = $membership_data{$index}{'Street 1'};
-               if($membership_data{$index}{'Street 2'} ne "") { 
-                   $address .= " " . $membership_data{$index}{'Street 2'};
-               }
-
-               # Find the family id for this parent's HofH_ID.
-               $sth = $dbh->prepare("select * from 3rd_family where hofh_id='$hofh_id' and valid=1");
-               $sth->execute or die "-E- DB error: $DBI::errstr\n";
-               my @family_data = ();
-               while($sqlhashref = $sth->fetchrow_hashref) { push(@family_data, $sqlhashref); }
-               my $family_rows = scalar @family_data;
-               if($family_rows > 0) { $family_id = $family_data[0]->{'family'}; }
-               else { $family_id = 0; }
-               
-               # Find out how many parents match this parent's name
-               $sth = $dbh->prepare("select * from 3rd_parent where name='$parent_name'");
-               $sth->execute or die "-E- DB error: $DBI::errstr\n";
-               my @data = ();
-               while($sqlhashref = $sth->fetchrow_hashref) { push(@data, $sqlhashref); }
-               my $rows = scalar @data;
-               
-               if($rows == 0 && $family_rows > 0) {
-                   # No existing records found for this parent, make a new entry
-                   print "   Adding new Parent: $parent_name\n";
-                   $sth = $dbh->prepare("insert into 3rd_parent values (NULL,$family_id,'$parent_name','$year-$month-$day','$phone','$address','$id',1)");
-                   $sth->execute or die "-E- DB error: $DBI::errstr\n";
-               } elsif($rows == 1 && $family_rows > 0) {
-                   # An existing record was found for this parent, update it
-                   print "   Updating existing parent: $parent_name\n";
-                   $sth = $dbh->prepare("update 3rd_parent set family='$family_id' where name='$parent_name'");
-                   $sth->execute or die "-E- DB error: $DBI::errstr\n";
-                   $sth = $dbh->prepare("update 3rd_parent set birthday='$year-$month-$day' where name='$parent_name'");
-                   $sth->execute or die "-E- DB error: $DBI::errstr\n";
-                   $sth = $dbh->prepare("update 3rd_parent set phone='$phone' where name='$parent_name'");
-                   $sth->execute or die "-E- DB error: $DBI::errstr\n";
-                   $sth = $dbh->prepare("update 3rd_parent set address='$address' where name='$parent_name'");
-                   $sth->execute or die "-E- DB error: $DBI::errstr\n";
-                   $sth = $dbh->prepare("update 3rd_parent set valid=1 where name='$parent_name'");
-                   $sth->execute or die "-E- DB error: $DBI::errstr\n";
-                   $sth = $dbh->prepare("update 3rd_parent set indiv_id='$id' where name='$parent_name'");
-                   $sth->execute or die "-E- DB error: $DBI::errstr\n";
-               } elsif($rows > 1) {
-                   # More than one record was found. Error! This shouldn't happen.
-                   print "   -E- More than one record found with same parent name: $parent_name with hofh_id: $hofh_id\n";
-               } else {
-                   print "   -E- Unable to find a family to attach this parent to: $parent_name with hofh_id: $hofh_id\n";
-               }
-               $sth->finish();
-           }
-       }
-    }
-}
-
-# 3RD_CHILD
-#+----------+------------------+------+-----+---------+-------+
-#| Field    | Type             | Null | Key | Default | Extra |
-#+----------+------------------+------+-----+---------+-------+
-#| child    | int(16) unsigned |      | PRI | 0       |   A   |
-#| family   | int(16) unsigned | YES  |     | NULL    |       |
-#| name     | varchar(30)      | YES  |     | NULL    |       |
-#| birthday | date             | YES  |     | NULL    |       |
-#| indiv_id | int(16) unsigned | YES  | UNI | NULL    |       |
-#| valid    | tinyint(1)       | YES  |     | NULL    |       |
-#+----------+------------------+------+-----+---------+-------+
-sub update_3rd_child_table
-{
-    print "\n-> Updating 3rd_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 3rd_child set valid=0");
-    $sth->execute or die "-E- DB error: $DBI::errstr\n";
-    
-    foreach $index (keys %membership_data)
-    {
-       $hashref = $membership_data{$index};
-       foreach $key (keys %$hashref) {
-           if($key =~ /HH Position/i && $membership_data{$index}{$key} =~ /Other/i ) {
-               $child_name = $membership_data{$index}{'Full Name'};
-               $child_name =~ s/\'/\\'/g; #'
-               $birthday = $membership_data{$index}{'Birth'};
-               $birthday =~ /(\d+) (\S+) (\d+)/; $day=$1; $month=$monthname2num{$2}; $year=$3;
-               $id = $membership_data{$index}{'Indiv ID'};
-               $hofh_id = $membership_data{$index}{'HofH ID'};
-
-               # Find the family id for this child's HofH_ID.
-               $sth = $dbh->prepare("select * from 3rd_family where hofh_id='$hofh_id' and valid=1");
-               $sth->execute or die "-E- DB error: $DBI::errstr\n";
-               my @family_data = ();
-               while($sqlhashref = $sth->fetchrow_hashref) { push(@family_data, $sqlhashref); }
-               my $family_rows = scalar @family_data;
-               if($family_rows > 0) { $family_id = $family_data[0]->{'family'}; }
-               else { $family_id = 0; }
-               
-               # Find out how many children have the same name for the same family
-               $sth = $dbh->prepare("select * from 3rd_child where name='$child_name'");
-               $sth->execute or die "-E- DB error: $DBI::errstr\n";
-               my @data = ();
-               while($sqlhashref = $sth->fetchrow_hashref) { push(@data, $sqlhashref); }
-               my $rows = scalar @data;
-               
-               if($rows == 0 && $family_rows > 0) {
-                   # No existing records found for this child, make a new entry
-                   print "   Adding new Child: $child_name\n";
-                   $sth = $dbh->prepare("insert into 3rd_child values (NULL,$family_id,'$child_name','$year-$month-$day','$id',1)");
-                   $sth->execute or die "-E- DB error: $DBI::errstr\n";
-               } elsif($rows == 1 && $family_rows > 0) {
-                   # An existing record was found for this child, update it
-                   print "   Updating existing child: $child_name\n";
-                   $sth = $dbh->prepare("update 3rd_child set family='$family_id' where name='$child_name'");
-                   $sth->execute or die "-E- DB error: $DBI::errstr\n";
-                   $sth = $dbh->prepare("update 3rd_child set birthday='$year-$month-$day' where name='$child_name'");
-                   $sth->execute or die "-E- DB error: $DBI::errstr\n";
-                   $sth = $dbh->prepare("update 3rd_child set valid=1 where name='$child_name'");
-                   $sth->execute or die "-E- DB error: $DBI::errstr\n";
-                   $sth = $dbh->prepare("update 3rd_child set indiv_id='$id' where name='$child_name'");
-                   $sth->execute or die "-E- DB error: $DBI::errstr\n";
-               } else {
-                   # More than one record was found. Error! This shouldn't happen.
-                   print "   -E- More than one record found ($rows) with same child name: $child_name\n";
-               }
-               $sth->finish();
-           }
-       }
-    }
-}
-
 # 3RD_VISIT
 #+----------------+------------------+------+-----+---------+-------+
 #| Field          | Type             | Null | Key | Default | Extra |
@@ -701,9 +447,9 @@ sub update_3rd_child_table
 #| notes          | varchar(128)     | YES  |     | NULL    |       |
 #| visited        | varchar(1)       | YES  |     | NULL    |       |
 #+----------------+------------------+------+-----+---------+-------+
-sub update_3rd_visit_table
+sub update_tc_visit_table
 {
-       print "\n-> updating 3rd_visit table\n";
+       print "\n-> updating tc_visit table\n";
        
        my $month_header_retrieved = 0;
        my $month_header;
@@ -720,8 +466,8 @@ sub update_3rd_visit_table
                $family_name = $hometeaching_stats_data{$index}{"Preferred Name"};
                print "   Updating visit data: $family_name\n";
 
-               # get family id from 3rd_family
-               $sth = $dbh->prepare("select * from 3rd_family where name=\"$family_name\" and valid=1");
+               # get family id from tc_family
+               $sth = $dbh->prepare("select * from tc_family where name=\"$family_name\" and valid=1");
                $sth->execute or die "-E- DB error: $DBI::errstr\n";
                my @family_data = ();
                while($sqlhashref = $sth->fetchrow_hashref) { push(@family_data, $sqlhashref); }
@@ -769,8 +515,8 @@ sub update_3rd_visit_table
                        #print "$visit_date\n";
                        my $importing_status = $visit_status{$history[$i]};
                        #print "importing_status = $importing_status\n";
-                       #print "select * from 3rd_visit where family=$family_id and companionship=$comp_id and date='$visit_date'\n";
-                       $sth = $dbh->prepare("select * from 3rd_visit where family=$family_id and companionship=$comp_id and date='$visit_date'");
+                       #print "select * from tc_visit where family=$family_id and companionship=$comp_id and date='$visit_date'\n";
+                       $sth = $dbh->prepare("select * from tc_visit where family=$family_id and companionship=$comp_id and date='$visit_date'");
                        $sth->execute or die "-E- DB error: $DBI::errstr\n";
                        my @visit_data = ();
                        while($sqlhashref = $sth->fetchrow_hashref) { push(@visit_data, $sqlhashref); }
@@ -778,18 +524,18 @@ sub update_3rd_visit_table
                        if($visit_rows > 0) { 
                                my $visited = $visit_data[0]->{'visited'}; 
                                #print "visited = $visited\n";
-                               # update visit if data is different in 3rd_visit
+                               # update visit if data is different in tc_visit
                                if ($visited ne $importing_status)
                                {
                                        #print "importing_status = $importing_status\n";
-                                       $sth = $dbh->prepare("update 3rd_visit set visited='$importing_status' where family='$family_id' and date='$visit_date' and companionship='$comp_id'");
+                                       $sth = $dbh->prepare("update tc_visit set visited='$importing_status' where family='$family_id' and date='$visit_date' and companionship='$comp_id'");
                                        $sth->execute or die "-E- DB error: $DBI::errstr\n";
                                }
                        } else {
                                if ($importing_status ne '')
                                {
-                                       # add visit if it doesn't exist in 3rd_visit
-                                       $sth = $dbh->prepare("insert into 3rd_visit values (NULL, '$family_id', '$comp_id', '', '', '$visit_date', '', '$importing_status', 'hometeaching')");
+                                       # add visit if it doesn't exist in tc_visit
+                                       $sth = $dbh->prepare("insert into tc_visit values (NULL, '$family_id', '$comp_id', '', '', '$visit_date', '', '$importing_status', 'hometeaching')");
                                        $sth->execute or die "-E- DB error: $DBI::errstr\n";
                                }
                        }
@@ -833,6 +579,36 @@ sub check_for_changed_ids
     return $found_problem;
 }
 
+sub update_family_in_tc_indiv_table
+{
+    print "\n-> Updating family info in tc_indiv table\n";
+
+    foreach $index (keys %membership_data)
+    {
+       $hashref = $membership_data{$index};
+       
+       # get some information from hash about this individual
+       $name = $membership_data{$index}{'Preferred Name'};
+       $hofh_id = $membership_data{$index}{'HofH ID'};
+       
+       # Find the family id for this individual's HofH_id
+       $sth = $dbh->prepare("select * from tc_family where hofh_id=$hofh_id and valid=1");
+       $sth->execute or die "-E- DB error: $DBI::errstr\n";
+       my @family_data = ();
+       while($sqlhashref = $sth->fetchrow_hashref) { push(@family_data, $sqlhashref); }
+       my $family_rows = scalar @family_data;
+       if($family_rows > 0) { 
+               $family_id = $family_data[0]->{'family'};
+               
+               print "   Updating family data for: $name\n";
+               
+               # write the family id to the individual's data in tc_indiv
+               $sth = $dbh->prepare("update tc_indiv set family='$family_id' where name=\"$name\""); 
+               $sth->execute or die "-E- DB error: $DBI::errstr\n";
+       } else { $family_id = 0; }
+    }
+}
+
 ######################################################################
 # MAIN
 ######################################################################
@@ -896,15 +672,13 @@ if($opt_v) {
 if($opt_s) { $dbh->disconnect(); exit; }
 
 # Now update the various eq DB tables
-&update_3rd_calling_table();
-&update_3rd_indiv_table();
-&update_3rd_aaronic_table();
-&update_3rd_district_table();
-&update_3rd_companionship_table();
-&update_3rd_family_table();
-&update_3rd_parent_table();
-&update_3rd_child_table();
-&update_3rd_visit_table();
+&update_tc_calling_table();
+&update_tc_indiv_table();
+&update_tc_district_table();
+&update_tc_companionship_table();
+&update_tc_family_table();
+&update_tc_visit_table();
+&update_family_in_tc_indiv_table();
 
 print "\n-> Import Successful! DONE...\n";