X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=bin%2Fimport_ward_data;h=da32a0d873dd05996bf3b58bb9bea2a40bfe8e35;hb=bf339f318906f8965f5b81e9e4c5eb431f57219a;hp=2b22197357de0f08a0a920f3c2cc488acebb8b26;hpb=3922955bdc5c67d0ad7485288016754aa981b280;p=eq%2F.git

diff --git a/bin/import_ward_data b/bin/import_ward_data
index 2b22197..da32a0d 100755
--- a/bin/import_ward_data
+++ b/bin/import_ward_data
@@ -30,144 +30,85 @@ $monthname2num{'Dec'} = '12';
 ######################################################################
 sub csv_to_hash
 {
-    my ($filename, $hashref) = @_;
-
-    open(FILE,$filename) || die "-E- Could not open $filename for reading\n";
-
-    my $found_header = 0; my $index = 0;
-    while(<FILE>)
-    {
-	$line = $_;
-	@data = split /\",/, $line;
-	if(!$found_header) { @header = @data; $found_header = 1; }
-	else {
-	    foreach $i (0..$#data-1) {
-		$data[$i] =~ s/\"//g;
-		$header[$i] =~ s/\"//g;
-	        $hashref->{$index}{$header[$i]} = $data[$i];
-		#print "$index: $i: $header[$i]: $data[$i]\n";
-	    }
-	    $index++;
+	my ($filename, $hashref) = @_;
+
+	open(FILE,$filename) || die "-E- Could not open $filename for reading\n";
+
+	my $found_header = 0; my $index = 0;
+	while(<FILE>) {
+		$line = $_;
+		@data = split /\",/, $line;
+		if(!$found_header) { 
+			@header = @data; 
+			$found_header = 1; 
+		} else {
+			foreach $i (0..$#data-1) {
+				$data[$i] =~ s/\"//g;
+				$header[$i] =~ s/\"//g;
+				$hashref->{$index}{$header[$i]} = $data[$i];
+				#print "$index: $i: $header[$i]: $data[$i]\n";
+			}
+			$index++;
+		}
 	}
-    }
-    
-    close(FILE);
-}
 
-sub optional_csv_to_hash
-{
-    my ($filename, $hashref) = @_;
-
-    my $opened = open(FILE,$filename);
-
-    if ($opened) {
-        my $found_header = 0; my $index = 0;
-        while(<FILE>)
-        {
-	    $line = $_;
-	    @data = split /\",/, $line;
-	    if(!$found_header) { @header = @data; $found_header = 1; }
-	    else {
-	        foreach $i (0..$#data-1) {
-		    $data[$i] =~ s/\"//g;
-		    $header[$i] =~ s/\"//g;
-	            $hashref->{$index}{$header[$i]} = $data[$i];
-		    #print "$index: $i: $header[$i]: $data[$i]\n";
-	        }
-	        $index++;
-	    }
-        }
-    
-    close(FILE);
-    }
-    else
-    {
-        print "-W- could not open optional csv file $filename\n";
-    }
+	close(FILE);
 }
 
-######################################################################
-sub print_hash
+sub optional_csv_to_hash
 {
-    my ($hashref) = @_;
+	my ($filename, $hashref) = @_;
+
+	my $opened = open(FILE,$filename);
+
+	if ($opened) {
+		my $found_header = 0; my $index = 0;
+		while(<FILE>) {
+			$line = $_;
+			@data = split /\",/, $line;
+			if(!$found_header) { 
+				@header = @data; 
+				$found_header = 1; 
+			} else {
+				foreach $i (0..$#data-1) {
+					$data[$i] =~ s/\"//g;
+					$header[$i] =~ s/\"//g;
+					$hashref->{$index}{$header[$i]} = $data[$i];
+					#print "$index: $i: $header[$i]: $data[$i]\n";
+				}
+				$index++;
+			}
+		}
 
-    foreach $key (sort {$a <=> $b} keys %$hashref) {
-	print "Index: $key\n";
-	foreach $field (keys %{$hashref->{$key}}) {
-	    print "$field: $hashref->{$key}{$field}\n";
+		close(FILE);
+	}
+	else
+	{
+	print "-W- could not open optional csv file $filename\n";
 	}
-	print "\n";
-    }
 }
 
 ######################################################################
-
-# EQ_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_eq_aaronic_table
+sub print_hash
 {
-    print "\n-> Updating eq_aaronic table\n";
+	my ($hashref) = @_;
 
-    # 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");
-    $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 eq_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 eq_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 eq_aaronic set phone='$phone' where name='$aaronic_name'");
-		    $sth->execute or die "-E- DB error: $DBI::errstr\n";
-		    $sth = $dbh->prepare("update eq_aaronic set email='$email' where name='$aaronic_name'");
-		    $sth->execute or die "-E- DB error: $DBI::errstr\n";
-		    $sth = $dbh->prepare("update eq_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";
+	foreach $key (sort {$a <=> $b} keys %$hashref) {
+		print "Index: $key\n";
+		foreach $field (keys %{$hashref->{$key}}) {
+			print "$field: $hashref->{$key}{$field}\n";
 		}
-	    }
+		print "\n";
 	}
-    }
-    $sth->finish();
 }
 
-# EQ_ELDER
+######################################################################
+
+# 3RD_INDIV
 #+-------------+------------------+------+-----+---------+----------------+
 #| Field       | Type             | Null | Key | Default | Extra          |
 #+-------------+------------------+------+-----+---------+----------------+
-#| elder       | int(16) unsigned |      | PRI | NULL    | auto_increment |
+#| indiv       | int(16) unsigned |      | PRI | NULL    | auto_increment |
 #| indiv_id    | int(16) unsigned |      |     | NULL    |                |
 #| name        | varchar(60)      | YES  |     | NULL    |                |
 #| phone       | varchar(12)      | YES  |     | NULL    |                |
@@ -180,43 +121,26 @@ sub update_eq_aaronic_table
 #| attending   | tinyint(1)       | YES  |     | 0       |                |
 #| valid       | tinyint(1)       | YES  |     | NULL    |                |
 #+-------------+------------------+------+-----+---------+----------------+
-sub update_eq_elder_table
+sub update_tc_indiv_table
 {
-    print "\n-> Updating eq_elder 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 eq_elder 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;}
-		}
-		
+	# Set all records to be invalid. Only mark them as valid if they appear on the new list.
+	$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};
 		$id = $membership_data{$index}{'Indiv ID'};
-		$elder_name = $membership_data{$index}{'Preferred Name'};
+		$indiv_name = $membership_data{$index}{'Preferred Name'};
+		$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/) ||
@@ -226,48 +150,54 @@ sub update_eq_elder_table
 		   ) { $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}{'Individual E-mail'};
+		$email = $membership_data{$index}{'indiv E-mail'};
 		if ($email eq "") { $email = $membership_data{$index}{'Household E-mail'}; }
-		$sth = $dbh->prepare("select * from eq_elder where name='$elder_name'");
+		$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 elder, make a new entry
-		    print "   Adding new Elder: $elder_name\n";
-		    $sth = $dbh->prepare("insert into eq_elder values (NULL,'$id','$elder_name','$phone','$email','$priesthood','1','','1','',$attending,1)");
-		    $sth->execute or die "-E- DB error: $DBI::errstr\n";
+			# 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\",'$address','$phone','$email','','$hhposition','$priesthood','','$default_interview_pri','','$default_interview_pri','',$attending,1)");
+			$sth->execute or die "-E- DB error: $DBI::errstr\n";
 		} elsif($rows == 1) {
-		    # An existing record was found for this elder, update it
-		    print "   Updating existing Elder: $elder_name\n";
-		    $sth = $dbh->prepare("update eq_elder set valid=1 where name='$elder_name'");
-		    $sth->execute or die "-E- DB error: $DBI::errstr\n";
-		    if($phone ne "") { 
-			$sth = $dbh->prepare("update eq_elder set phone='$phone' where name='$elder_name'");
-		    } else {
-			$sth = $dbh->prepare("update eq_elder set phone=NULL where name='$elder_name'");
-		    }
-		    $sth->execute or die "-E- DB error: $DBI::errstr\n";
-		    $sth = $dbh->prepare("update eq_elder set attending='$attending' where name='$elder_name'");
-		    $sth->execute or die "-E- DB error: $DBI::errstr\n";
-		    $sth = $dbh->prepare("update eq_elder set indiv_id='$id' where name='$elder_name'");
-		    $sth->execute or die "-E- DB error: $DBI::errstr\n";
-		    $sth = $dbh->prepare("update eq_elder set priesthood='$priesthood' where name='$elder_name'");
-		    $sth->execute or die "-E- DB error: $DBI::errstr\n";
-		    $sth = $dbh->prepare("update eq_elder set email='$email' where name='$elder_name'");
-		    $sth->execute or die "-E- DB error: $DBI::errstr\n";
+			# 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($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 Elder: $elder_name\n";
+			# 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();
+	$sth->finish();
 }
 
-# EQ_CALLING
+# 3RD_CALLING
 #+--------------+------------------+------+-----+---------+-------+
 #| Field        | Type             | Null | Key | Default | Extra |
 #+--------------+------------------+------+-----+---------+-------+
@@ -278,38 +208,38 @@ sub update_eq_elder_table
 #| sequence     | int(16) unsigned | YES  |     | NULL    |       |
 #| sustained    | date             | YES  |     | NULL    |       |
 #+--------------+------------------+------+-----+---------+-------+
-sub update_eq_calling_table()
+sub update_tc_calling_table()
 {
-    print "\n-> Updating eq_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 eq_calling ");
-    $sth->execute or die "-E- DB error: $DBI::errstr\n";
-    
-    foreach $index (keys %organization_data)
-    {
-	$indiv_id = $organization_data{$index}{'Indiv ID'};
-	$name = $organization_data{$index}{'Indiv Name'};
-	$name =~ s/\'/\\'/g; #'
-	$organization = $organization_data{$index}{'Organization'};
-	$organization_by_name{$name} = $organization;
-	$organization_by_id{$indiv_id} = $organization;
-	$position = $organization_data{$index}{'Position'};
-	$sequence = $organization_data{$index}{'Org Seq'};
-	$sustained = $organization_data{$index}{'Sustained'};
-	$sustained =~ /(\S+) (\d+)/; $month=$1; $year=$2;
-	if($name eq "") { next; }
-	print "   Adding new Calling: $name -> $position\n";
-	$sth = $dbh->prepare("insert into eq_calling values ('$indiv_id','$name','$organization','$position','$sequence','$month $year')");
+	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 tc_calling ");
 	$sth->execute or die "-E- DB error: $DBI::errstr\n";
-    }
+
+	foreach $index (keys %organization_data)
+	{
+		$indiv_id = $organization_data{$index}{'Indiv ID'};
+		$name = $organization_data{$index}{'Indiv Name'};
+		$name =~ s/\'/\\'/g; #'
+		$organization = $organization_data{$index}{'Organization'};
+		$organization_by_name{$name} = $organization;
+		$organization_by_id{$indiv_id} = $organization;
+		$position = $organization_data{$index}{'Position'};
+		$sequence = $organization_data{$index}{'Org Seq'};
+		$sustained = $organization_data{$index}{'Sustained'};
+		$sustained =~ /(\S+) (\d+)/; $month=$1; $year=$2;
+		if($name eq "") { next; }
+		print "   Adding new Calling: $name -> $position\n";
+		$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";
+	}
 }
 
-# EQ_DISTRICT
+# 3RD_DISTRICT
 #+------------+------------------+------+-----+---------+-------+
 #| Field      | Type             | Null | Key | Default | Extra |
 #+------------+------------------+------+-----+---------+-------+
@@ -318,115 +248,90 @@ sub update_eq_calling_table()
 #| supervisor | int(16) unsigned | YES  |     | NULL    |       |
 #| valid      | tinyint(1)       | YES  |     | NULL    |       |
 #+------------+------------------+------+-----+---------+-------+
-sub update_eq_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 eq_district table\n";
-    $sth = $dbh->prepare("select * from eq_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 eq_elder 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->{elder};
+	$supervisor_id = $sqlhashref2->{indiv};
 	$sth2->finish();
-	$sth2 = $dbh->prepare("update eq_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();
     }
     $sth->finish();
 }
 
-# EQ_COMPANIONSHIP
+# 3RD_COMPANIONSHIP
 #+---------------+------------------+------+-----+---------+-------+
 #| Field         | Type             | Null | Key | Default | Extra |
 #+---------------+------------------+------+-----+---------+-------+
 #| companionship | int(16) unsigned |      |     | 0       |       |
-#| elder         | int(16) unsigned | YES  |     | NULL    |       |
-#| aaronic       | int(16) unsigned | YES  |     | NULL    |       |
+#| indiv         | int(16) unsigned | YES  |     | NULL    |       |
 #| district      | int(16) unsigned | YES  |     | NULL    |       |
 #| valid         | tinyint(1)       | YES  |     | NULL    |       |
 #+---------------+------------------+------+-----+---------+-------+
-sub update_eq_companionship_table
+sub update_tc_companionship_table
 {
-    print "\n-> Updating eq_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 eq_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 eq_aaronic set valid=0");
-    $sth->execute or die "-E- DB error: $DBI::errstr\n";
-    
-    foreach $index (keys %hometeaching_data)
-    {
-	$hashref = $hometeaching_data{$index};
-	foreach $key (keys %$hashref) {
-	    if($key =~ /Quorum/i && $hometeaching_data{$index}{$key} =~ /Elders/i) {
-		foreach $field ("Home Teacher 1","Home Teacher 2") {
-		    $elder_name = $hometeaching_data{$index}{$field};
-		    if($elder_name eq "") { next; }
-		    $sth2 = $dbh->prepare("select * from eq_elder where name='$elder_name'");
-		    $sth2->execute or die "-E- DB error: $DBI::errstr\n";
-		    $sqlhashref2 = $sth2->fetchrow_hashref;
-		    $elder = $sqlhashref2->{elder};
-		    $aaronic = "NULL";
-		    if($elder eq "") {
-			$sth2 = $dbh->prepare("select * from eq_aaronic where name='$elder_name'");
-			$sth2->execute or die "-E- DB error: $DBI::errstr\n";
-			$sqlhashref2 = $sth2->fetchrow_hashref;
-			$aaronic = $sqlhashref2->{aaronic};
-			$elder = "NULL";
-			if($aaronic eq "") { print "-W- Unable to find $elder_name in eq_elder or eq_aaronic tables\n"; next; }
-		    } 
-		    $id = $hometeaching_data{$index}{'Comp ID'};
-		    $district = $hometeaching_data{$index}{'HT District'};
-		    $sth = $dbh->prepare("select * from eq_companionship where elder='$elder' and aaronic='$aaronic' and companionship='$id'");
-		    $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 companionship, make a new entry
-			print "   Adding Companion to companionship: $elder_name -> $id\n";
-			$sth = $dbh->prepare("insert into eq_companionship values ($id,'$elder','$aaronic','$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 eq_companionship where district='$district' and companionship='$id'");
-			$sth2->execute or die "-E- DB error: $DBI::errstr\n";
-			if($elder ne "NULL") {
-			    print "   Updating Companionship with Elder: $elder_name ($elder) -> $id\n";
-			    $sth = $dbh->prepare("update eq_companionship set district='$district' where elder='$elder' and companionship='$id'");
-			    $sth->execute or die "-E- DB error 'district': $DBI::errstr\n";
-			    $sth = $dbh->prepare("update eq_companionship set elder='$elder' where elder='$elder' and companionship='$id'");
-			    $sth->execute or die "-E- DB error 'elder': $DBI::errstr\n";
-			    $sth = $dbh->prepare("update eq_companionship set valid=1 where elder='$elder' and companionship='$id'");
-			    $sth->execute or die "-E- DB error 'valid': $DBI::errstr\n";
-			} else {
-			    print "   Updating Companionship with Aaronic: $elder_name ($aaronic) -> $id\n";
-			    $sth = $dbh->prepare("update eq_companionship set district='$district' where aaronic='$aaronic' and companionship='$id'");
-			    $sth->execute or die "-E- DB error: $DBI::errstr\n";
-			    $sth = $dbh->prepare("update eq_companionship set aaronic='$aaronic' where aaronic='$aaronic' and companionship='$id'");
-			    $sth->execute or die "-E- DB error: $DBI::errstr\n";
-			    $sth = $dbh->prepare("update eq_companionship set valid=1 where aaronic='$aaronic' and companionship='$id'");
-			    $sth->execute or die "-E- DB error: $DBI::errstr\n";			    
-			    $sth = $dbh->prepare("update eq_aaronic set valid=1 where aaronic='$aaronic'");
-			    $sth->execute or die "-E- DB error: $DBI::errstr\n";
+	# First, mark all existing companionships as invalid in case they have been dissolved
+	$sth = $dbh->prepare("update tc_companionship set valid=0");
+	$sth->execute or die "-E- DB error: $DBI::errstr\n";
+
+	foreach $index (keys %hometeaching_data)
+	{
+		$hashref = $hometeaching_data{$index};
+		foreach $key (keys %$hashref) {
+			if($key =~ /Quorum/i && $hometeaching_data{$index}{$key} =~ /Elders/i) {
+				foreach $field ("Home Teacher 1","Home Teacher 2") {
+					$indiv_name = $hometeaching_data{$index}{$field};
+					if($indiv_name eq "") { next; }
+					$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};
+					$id = $hometeaching_data{$index}{'Comp ID'};
+					$district = $hometeaching_data{$index}{'HT District'};
+					$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); }
+					my $rows = scalar @data;
+					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 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 tc_companionship where district='$district' and companionship='$id'");
+						$sth2->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();		    
+				}
 			}
-		    }
-		    $sth->finish();
-		    $sth2->finish();		    
 		}
-	    }
 	}
-    }
 }
 
-# EQ_FAMILY
+# 3RD_FAMILY
 #+---------------+------------------+------+-----+---------+-------+
 #| Field         | Type             | Null | Key | Default | Extra |
 #+---------------+------------------+------+-----+---------+-------+
@@ -434,263 +339,98 @@ sub update_eq_companionship_table
 #| hofh_id       | int(16) unsigned | YES  |     | NULL    |       |
 #| name          | varchar(30)      | YES  |     | NULL    |       |
 #| name_id       | varchar(30)      | YES  |     | NULL    |       |
-#| elder_id      | int(16) unsigned | YES  |     | NULL    |       |
+#| indiv_id      | int(16) unsigned | YES  |     | NULL    |       |
 #| companionship | int(16) unsigned | YES  |     | NULL    |       |
 #| visit_pri     | int(10) unsigned | YES  |     | 1       |       |
 #| visit_notes   | varchar(128)     | YES  |     | NULL    |       |
 #| valid         | tinyint(1)       | YES  |     | NULL    |       |
 #+---------------+------------------+------+-----+---------+-------+
-sub update_eq_family_table
-{
-    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");
-    $sth->execute or die "-E- DB error: $DBI::errstr\n";
-    $sth = $dbh->prepare("update eq_family set companionship=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) {
-		$family_name = $membership_data{$index}{'Preferred Name'};
-		$family_name =~ s/\'/\\'/g; #'
-		$id = $membership_data{$index}{'HofH ID'};
-		$name_id = uc($family_name);
-
-		# Find out how many families match this family's name
-		$sth = $dbh->prepare("select * from eq_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); }
-		my $rows = scalar @data;
-		
-		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 eq_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 eq_family set hofh_id=$id where name_id='$name_id'");
-		    $sth->execute or die "-E- DB error: $DBI::errstr\n";
-		    $sth = $dbh->prepare("update eq_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.
-		    print "   -E- More than one record found ($rows) for family name: $family_name\n";
-		}
-
-                # Now update the elder_id field for this family
-		$sth = $dbh->prepare("select * from eq_elder WHERE name='$family_name'");
-		$sth->execute or die "-E- DB error: $DBI::errstr\n";
-		while($sqlhashref = $sth->fetchrow_hashref) {
-		    $elder_id = $sqlhashref->{elder};
-		    print "   Updating family elder_id: $family_name -> $elder_id\n";
-		    $sth = $dbh->prepare("update eq_family set elder_id=$elder_id where name_id='$name_id'");
-		    $sth->execute or die "-E- DB error: $DBI::errstr\n";
-		}
-		
-		# Now update the hometeaching field for this family
-		foreach $index (keys %hometeaching_data)
-		{
-		    $hashref = $hometeaching_data{$index};
-		    foreach $key (keys %$hashref) {
-			if($hometeaching_data{$index}{'Household'} =~ /(\S+)\s+(\S+),\s+(\S+)\s+(.*)/) {
-			    $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 &&
-			   $hometeaching_data{$index}{'Household'} =~ /$family_name/i &&
-			   $data[0]->{companionship} != $hometeaching_data{$index}{'Comp ID'}
-			   )
-			{
-			    print "   Updating hometeaching assignment for $family_name family\n";
-			    $companionship = $hometeaching_data{$index}{'Comp ID'};
-			    $sth = $dbh->prepare("update eq_family set companionship='$companionship' where name_id='$name_id'");
-			    $sth->execute or die "-E- DB error: $DBI::errstr\n";
-			}
-		    }
-		}
-		$sth->finish();
-	    }
-	}
-    }
-}
-
-# EQ_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_eq_parent_table
+sub update_tc_family_table
 {
-    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");
-    $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'};
-		}
+	print "\n-> Updating tc_family table\n";
 
-		# Find the family id for this parent's HofH_ID.
-		$sth = $dbh->prepare("select * from eq_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 eq_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 eq_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 eq_parent set family='$family_id' where name='$parent_name'");
-		    $sth->execute or die "-E- DB error: $DBI::errstr\n";
-		    $sth = $dbh->prepare("update eq_parent set birthday='$year-$month-$day' where name='$parent_name'");
-		    $sth->execute or die "-E- DB error: $DBI::errstr\n";
-		    $sth = $dbh->prepare("update eq_parent set phone='$phone' where name='$parent_name'");
-		    $sth->execute or die "-E- DB error: $DBI::errstr\n";
-		    $sth = $dbh->prepare("update eq_parent set address='$address' where name='$parent_name'");
-		    $sth->execute or die "-E- DB error: $DBI::errstr\n";
-		    $sth = $dbh->prepare("update eq_parent set valid=1 where name='$parent_name'");
-		    $sth->execute or die "-E- DB error: $DBI::errstr\n";
-		    $sth = $dbh->prepare("update eq_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();
-	    }
-	}
-    }
-}
+	# Set all records to be invalid. Only mark them as valid if they appear on the new list.
+	$sth = $dbh->prepare("update tc_family set valid=0");
+	$sth->execute or die "-E- DB error: $DBI::errstr\n";
+	$sth = $dbh->prepare("update tc_family set companionship=0");
+	$sth->execute or die "-E- DB error: $DBI::errstr\n";
 
-# EQ_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_eq_child_table
-{
-    print "\n-> Updating eq_child table\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) {
+				$family_name = $membership_data{$index}{'Preferred Name'};
+				$family_name =~ s/\'/\\'/g; #'
+				$id = $membership_data{$index}{'HofH ID'};
+				$name_id = uc($family_name);
+
+				# Find out how many families match this family's name
+				$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); }
+				my $rows = scalar @data;
+
+				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 tc_family values (NULL,$id,'$family_name','$name_id','0','0','$default_visit_pri','',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 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 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.
+					print "   -E- More than one record found ($rows) for family name: $family_name\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");
-    $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'};
+				# Now update the indiv_id field for this family
+				$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 tc_family set indiv_id=$indiv_id where name_id='$name_id'");
+					$sth->execute or die "-E- DB error: $DBI::errstr\n";
+				}
 
-		# Find the family id for this child's HofH_ID.
-		$sth = $dbh->prepare("select * from eq_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 eq_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 eq_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 eq_child set family='$family_id' where name='$child_name'");
-		    $sth->execute or die "-E- DB error: $DBI::errstr\n";
-		    $sth = $dbh->prepare("update eq_child set birthday='$year-$month-$day' where name='$child_name'");
-		    $sth->execute or die "-E- DB error: $DBI::errstr\n";
-		    $sth = $dbh->prepare("update eq_child set valid=1 where name='$child_name'");
-		    $sth->execute or die "-E- DB error: $DBI::errstr\n";
-		    $sth = $dbh->prepare("update eq_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";
+				# Now update the hometeaching field for this family
+				foreach $index (keys %hometeaching_data)
+				{
+					$hashref = $hometeaching_data{$index};
+					foreach $key (keys %$hashref) {
+						if($hometeaching_data{$index}{'Household'} =~ /(\S+)\s+(\S+),\s+(\S+)\s+(.*)/) {
+							$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 &&
+						   $hometeaching_data{$index}{'Household'} =~ /$family_name/i &&
+						   $data[0]->{companionship} != $hometeaching_data{$index}{'Comp ID'}
+						   )
+						{
+							print "   Updating hometeaching assignment for $family_name family\n";
+							$companionship = $hometeaching_data{$index}{'Comp 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";
+						}
+					}
+				}
+				$sth->finish();
+			}
 		}
-		$sth->finish();
-	    }
 	}
-    }
 }
 
-# EQ_VISIT
+# 3RD_VISIT
 #+----------------+------------------+------+-----+---------+-------+
 #| Field          | Type             | Null | Key | Default | Extra |
 #+----------------+------------------+------+-----+---------+-------+
@@ -701,9 +441,9 @@ sub update_eq_child_table
 #| notes          | varchar(128)     | YES  |     | NULL    |       |
 #| visited        | varchar(1)       | YES  |     | NULL    |       |
 #+----------------+------------------+------+-----+---------+-------+
-sub update_eq_visit_table
+sub update_tc_visit_table
 {
-	print "\n-> updating eq_visit table\n";
+	print "\n-> updating tc_visit table\n";
 	
 	my $month_header_retrieved = 0;
 	my $month_header;
@@ -720,8 +460,8 @@ sub update_eq_visit_table
 		$family_name = $hometeaching_stats_data{$index}{"Preferred Name"};
 		print "   Updating visit data: $family_name\n";
 
-		# get family id from eq_family
-		$sth = $dbh->prepare("select * from eq_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 +509,8 @@ sub update_eq_visit_table
 			#print "$visit_date\n";
 			my $importing_status = $visit_status{$history[$i]};
 			#print "importing_status = $importing_status\n";
-			#print "select * from eq_visit where family=$family_id and companionship=$comp_id and date='$visit_date'\n";
-			$sth = $dbh->prepare("select * from eq_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 +518,18 @@ sub update_eq_visit_table
 			if($visit_rows > 0) { 
 				my $visited = $visit_data[0]->{'visited'}; 
 				#print "visited = $visited\n";
-				# update visit if data is different in eq_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 eq_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 eq_visit
-					$sth = $dbh->prepare("insert into eq_visit values (NULL, '$family_id', '$comp_id', '$visit_date', '', '$importing_status')");
+					# 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";
 				}
 			}
@@ -800,37 +540,92 @@ sub update_eq_visit_table
 ######################################################################
 sub check_for_changed_ids
 {
-    # If the Indiv ID & HofH ID has changed between data sets, we could have problems
-    my ($oldhashref, $newhashref) = @_;
-    my $found_problem = 0;
-    
-    foreach $oldindex (keys %$oldhashref)
-    {
-	$indiv_id = $oldhashref->{$oldindex}{'Indiv ID'};
-	$hofh_id  = $oldhashref->{$oldindex}{'HofH ID'};
-	$full_name = $oldhashref->{$oldindex}{'Full Name'};
-	$hh_position = $oldhashref->{$oldindex}{'HH Position'};
-	if($hh_position =~ /Other/i) { next; }
-
-	foreach $newindex (keys %$newhashref)
+	# If the Indiv ID & HofH ID has changed between data sets, we could have problems
+	my ($oldhashref, $newhashref) = @_;
+	my $found_problem = 0;
+
+	foreach $oldindex (keys %$oldhashref)
 	{
-	    if($newhashref->{$newindex}{'Full Name'} eq $full_name &&
-	       $indiv_id != $newhashref->{$newindex}{'Indiv ID'})
-	    {
-		print "-W- Indiv ID for $full_name changed from $indiv_id to $newhashref->{$newindex}{'Indiv ID'}\n";
-		$found_problem = 1;
-	    }
-
-	    if($newhashref->{$newindex}{'Full Name'} eq $full_name &&
-	       $hofh_id != $newhashref->{$newindex}{'HofH ID'})
-	    {
-		print "-W- HofH ID for $full_name changed from $hofh_id to $newhashref->{$newindex}{'HofH ID'}\n";
-		$found_problem = 1;
-	    }
+		$indiv_id = $oldhashref->{$oldindex}{'Indiv ID'};
+		$hofh_id  = $oldhashref->{$oldindex}{'HofH ID'};
+		$full_name = $oldhashref->{$oldindex}{'Full Name'};
+		$hh_position = $oldhashref->{$oldindex}{'HH Position'};
+		if($hh_position =~ /Other/i) { next; }
+
+		foreach $newindex (keys %$newhashref)
+		{
+			if($newhashref->{$newindex}{'Full Name'} eq $full_name &&
+			   $indiv_id != $newhashref->{$newindex}{'Indiv ID'})
+			{
+				print "-W- Indiv ID for $full_name changed from $indiv_id to $newhashref->{$newindex}{'Indiv ID'}\n";
+				$found_problem = 1;
+			}
+
+			if($newhashref->{$newindex}{'Full Name'} eq $full_name &&
+			   $hofh_id != $newhashref->{$newindex}{'HofH ID'})
+			{
+				print "-W- HofH ID for $full_name changed from $hofh_id to $newhashref->{$newindex}{'HofH ID'}\n";
+				$found_problem = 1;
+			}
+		}
+	}
+
+	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; 
+		}
+	}
+}
+
+sub update_organization_class_data
+{
+	print "\n-> Updating organization class info in tc_indiv table\n";
+
+	foreach $index (keys %organization_class_data)
+	{
+		# get name and organization info for each individual
+		$name = $organization_class_data{$index}{'Preferred Name'};
+		$org_class = $organization_class_data{$index}{'Organization Class'};
+
+		if ($org_class =~ m/Elder/i) {
+			#print "   $name:  Elder\n";
+			$sth = $dbh->prepare("update tc_indiv set steward='Elder' where name=\"$name\"");
+			$sth->execute or die "-E- DB error: $DBI::errstr\n";
+		}
+		if ($org_class =~ m/High Priest/i) {
+			#print "   $name:  High Priest\n";
+			$sth = $dbh->prepare("update tc_indiv set steward='High Priest' where name=\"$name\"");
+			$sth->execute or die "-E- DB error: $DBI::errstr\n";
+		}
 	}
-    }
-    
-    return $found_problem;
 }
 
 ######################################################################
@@ -847,23 +642,23 @@ $dbh=DBI->connect("dbi:mysql:dbname=$dbname:host=$dbhost:port=$dbport",$dbuser,$
 # Check old directory against new directory to ensure
 # that the Indiv ID & HofH ID have not changed between updates
 if(defined $opt_o) {
-    print "-> Comparing old data files to new ones: $opt_o => $opt_n\n";
-    my %old_membership_data = ();
-    my %new_membership_data = ();
-    &csv_to_hash("$opt_o/Membership.csv",\%old_membership_data);
-    &csv_to_hash("$opt_n/Membership.csv",\%new_membership_data);
-
-    $changed_ids=&check_for_changed_ids(\%old_membership_data, \%new_membership_data);
-    
-    if($changed_ids) {
-	print "\n";
-	print "-E- Some Indiv IDs and HofH IDs have changed for Head of Households between \n";
-	print "    $opt_o and $opt_n data sets.\n";
-	print "    This script is not currently setup to handle this properly.\n";
-	print "\n";
-	print "    Exiting without updating...\n\n";
-	exit;
-    }
+	print "-> Comparing old data files to new ones: $opt_o => $opt_n\n";
+	my %old_membership_data = ();
+	my %new_membership_data = ();
+	&csv_to_hash("$opt_o/Membership.csv",\%old_membership_data);
+	&csv_to_hash("$opt_n/Membership.csv",\%new_membership_data);
+
+	$changed_ids=&check_for_changed_ids(\%old_membership_data, \%new_membership_data);
+
+	if($changed_ids) {
+		print "\n";
+		print "-E- Some Indiv IDs and HofH IDs have changed for Head of Households between \n";
+		print "    $opt_o and $opt_n data sets.\n";
+		print "    This script is not currently setup to handle this properly.\n";
+		print "\n";
+		print "    Exiting without updating...\n\n";
+		exit;
+	}
 }
 
 ###################################################
@@ -874,7 +669,7 @@ print "\n-> Processing all ward data files in $datadir\n";
 
 ###################################################
 # Parse Ward Data Files
-&optional_csv_to_hash("$datadir/EQ\ Prospective\ Elders.csv", \%prospective_elder_data);
+&csv_to_hash("$datadir/Organization\ class\ per\ member.csv", \%organization_class_data);
 &csv_to_hash("$datadir/Membership.csv",\%membership_data);
 &csv_to_hash("$datadir/HomeTeaching.csv",\%hometeaching_data);
 &csv_to_hash("$datadir/Organization.csv",\%organization_data);
@@ -883,28 +678,27 @@ print "\n-> Processing all ward data files in $datadir\n";
 %organization_by_id = ();
 
 if($opt_v) {
-    print "-> Membership Data Dump\n\n";
-    &print_hash(\%membership_data);
-    print "-> HomeTeaching Data Dump\n\n";
-    &print_hash(\%hometeaching_data);
-    print "-> Organization Data Dump\n\n";
-    &print_hash(\%organization_data);
-    print "-> HomeTeaching Stats Data Dump\n\n";
-    &print_hash(\%hometeaching_stats_data);
+	print "-> Membership Data Dump\n\n";
+	&print_hash(\%membership_data);
+	print "-> HomeTeaching Data Dump\n\n";
+	&print_hash(\%hometeaching_data);
+	print "-> Organization Data Dump\n\n";
+	&print_hash(\%organization_data);
+	print "-> HomeTeaching Stats Data Dump\n\n";
+	&print_hash(\%hometeaching_stats_data);
 }
 
 if($opt_s) { $dbh->disconnect(); exit; }
 
 # Now update the various eq DB tables
-&update_eq_calling_table();
-&update_eq_elder_table();
-&update_eq_aaronic_table();
-&update_eq_district_table();
-&update_eq_companionship_table();
-&update_eq_family_table();
-&update_eq_parent_table();
-&update_eq_child_table();
-&update_eq_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();
+&update_organization_class_data();
 
 print "\n-> Import Successful! DONE...\n";