change supervisor field in tc_district and tc_district_sandbox to leader
[eq/.git] / bin / import_ward_data
index 37fb24869615dcbad74fd17a69be1b442c64559b..ae20ab741372e1fe42dcf13024ed49d6e96dfe63 100755 (executable)
@@ -30,638 +30,493 @@ $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);
+
+       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";
-    }
+       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";
+       }
 }
 
 ######################################################################
 sub print_hash
 {
-    my ($hashref) = @_;
+       my ($hashref) = @_;
 
-    foreach $key (sort {$a <=> $b} keys %$hashref) {
-       print "Index: $key\n";
-       foreach $field (keys %{$hashref->{$key}}) {
-           print "$field: $hashref->{$key}{$field}\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";
        }
-       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    |       |
-#| valid   | tinyint(1)       | YES  |     | NULL    |       |
-#+-------+--------------------+------+-----+---------+-------+
-sub update_eq_aaronic_table
+# TC_INDIVIDUAL
+#+----------------------+------------------+------+-----+---------+----------------+
+#| Field                | Type             | Null | Key | Default | Extra          |
+#+----------------------+------------------+------+-----+---------+----------------+
+#| individual           | int(16) unsigned |      | PRI | NULL    | auto_increment |
+#| mls_id               | int(16) unsigned |      |     | NULL    |                |
+#| name                 | varchar(60)      | YES  |     | NULL    |                |
+#| fullname             | varchar(60)      | YES  |     | NULL    |                |
+#| phone                | varchar(12)      | YES  |     | NULL    |                |
+#| email                | varchar(120)     | YES  |     | NULL    |                |
+#| priesthood           | enum             | YES  |     | NULL    |                |
+#| scheduling_priority  | int(10) unsigned | YES  |     | 30      |                |
+#| attending            | tinyint(1)       | YES  |     | 0       |                |
+#| valid                | tinyint(1)       | YES  |     | NULL    |                |
+#+----------------------+------------------+------+-----+---------+----------------+
+sub update_tc_individual_table
 {
-    print "\n-> Updating eq_aaronic table\n";
-
-    # Set all records to be invalid. Only mark them as valid if they appear on the new list.
-    $sth = $dbh->prepare("update eq_aaronic set valid=0");
-    $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"; }
-               $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',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 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();
-}
+       print "\n-> Updating tc_individual table\n";
 
-# EQ_ELDER
-#+-------------+------------------+------+-----+---------+----------------+
-#| Field       | Type             | Null | Key | Default | Extra          |
-#+-------------+------------------+------+-----+---------+----------------+
-#| elder       | int(16) unsigned |      | PRI | NULL    | auto_increment |
-#| indiv_id    | int(16) unsigned |      |     | NULL    |                |
-#| name        | varchar(60)      | YES  |     | NULL    |                |
-#| phone       | varchar(12)      | YES  |     | NULL    |                |
-#| email       | varchar(120)     | YES  |     | NULL    |                |
-#| ppi_pri     | int(10) unsigned | YES  |     | 1       |                |
-#| ppi_notes   | varchar(128)     | YES  |     | NULL    |                |
-#| int_pri     | int(10) unsigned | YES  |     | 1       |                |
-#| int_notes   | varchar(128)     | YES  |     | NULL    |                |
-#| attending   | tinyint(1)       | YES  |     | 0       |                |
-#| valid       | tinyint(1)       | YES  |     | NULL    |                |
-#+-------------+------------------+------+-----+---------+----------------+
-sub update_eq_elder_table
-{
-    print "\n-> Updating eq_elder table\n";
-
-    # Set all records to be invalid. Only mark them as valid if they appear on the new list.
-    $sth = $dbh->prepare("update eq_elder set valid=0");
-    $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} =~ /Elder/i) {
+       # Set all records to be invalid. Only mark them as valid if they appear on the new list.
+       $sth = $dbh->prepare("update tc_individual 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'};
+               $individual_name = $membership_data{$index}{'Preferred Name'};
+               $full_name = $membership_data{$index}{'Full 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'};
-               $organization = $organization_by_id{$id};
+               $priesthood = $membership_data{$index}{'Priesthood'};
+               $hhposition = $membership_data{$index}{'HH Position'};
+               $steward = ""; # This will be set correctly in a later method
+               # Set the default stewardship if the "Organization data per member.csv" isn't available.
+               # Only validate priesthood holders that match the $default_stewardship since 
+               # we don't have any other data available to us to make this call if we don't have the report.
+               if((! -e "$datadir/Organization\ class\ per\ member.csv") && ($priesthood =~ /$default_stewardship/i)) { 
+                       $steward = "$default_stewardship";
+               }
                $attending = 0;
                if(($organization =~ /Elders/) ||
                   ($organization =~ /Young Men/) ||
                   ($organization =~ /Sunday School/) ||
                   ($organization =~ /Primary/)
-                  ) { $attending = 1; }
+                 ) { $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_individual where mls_id='$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 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','1','','1','',$attending,1)");
-                   $sth->execute or die "-E- DB error: $DBI::errstr\n";
+                       # No existing records found for this individual, make a new entry
+                       print "   Adding new individual: $individual_name\n";
+                       $sth = $dbh->prepare("insert into tc_individual values (NULL,'$id',\"$individual_name\",\"$full_name\",'$address','$phone','$email','$hhposition','$priesthood','$steward',NULL,$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 email='$email' where name='$elder_name'");
-                   $sth->execute or die "-E- DB error: $DBI::errstr\n";
+                       # An existing record was found for this individual, update it
+                       print "   Updating existing individual: $individual_name\n";
+                       $sth = $dbh->prepare("update tc_individual set valid=1 where mls_id='$id'");
+                       $sth->execute or die "-E- DB error: $DBI::errstr\n";
+                       if($phone ne "") { 
+                               $sth = $dbh->prepare("update tc_individual set phone='$phone' where mls_id='$id'");
+                       } else {
+                               $sth = $dbh->prepare("update tc_individual set phone=NULL where mls_id='$id'");
+                       }
+                       $sth->execute or die "-E- DB error: $DBI::errstr\n";
+                       if($address ne "") { 
+                               $sth = $dbh->prepare("update tc_individual set address='$address' where mls_id='$id'");
+                       } else {
+                               $sth = $dbh->prepare("update tc_individual set address=NULL where mls_id='$id'");
+                       }
+                       $sth->execute or die "-E- DB error: $DBI::errstr\n";
+                       $sth = $dbh->prepare("update tc_individual set attending='$attending' where mls_id='$id'");
+                       $sth->execute or die "-E- DB error: $DBI::errstr\n";
+                       $sth = $dbh->prepare("update tc_individual set name=\"$individual_name\" where mls_id='$id'");
+                       $sth->execute or die "-E- DB error: $DBI::errstr\n";
+                       $sth = $dbh->prepare("update tc_individual set fullname=\"$full_name\" where mls_id='$id'");
+                       $sth->execute or die "-E- DB error: $DBI::errstr\n";
+                       $sth = $dbh->prepare("update tc_individual set priesthood='$priesthood' where mls_id='$id'");
+                       $sth->execute or die "-E- DB error: $DBI::errstr\n";
+                       $sth = $dbh->prepare("update tc_individual set email='$email' where mls_id='$id'");
+                       $sth->execute or die "-E- DB error: $DBI::errstr\n";
+                       $sth = $dbh->prepare("update tc_individual set hh_position='$hhposition' where mls_id='$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 Elder: $elder_name\n";
+                       # More than one record was found. Error! This shouldn't happen.
+                       print "   -E- More than one record found ($rows) for individual: $individual_name\n";
                }
-           }
        }
-    }
-    $sth->finish();
+       $sth->finish();
 }
 
-# EQ_CALLING
+# TC_CALLING
 #+--------------+------------------+------+-----+---------+-------+
 #| Field        | Type             | Null | Key | Default | Extra |
 #+--------------+------------------+------+-----+---------+-------+
-#| indiv_id     | int(16) unsigned | YES  |     | NULL    |       |
 #| name         | varchar(30)      | YES  |     | NULL    |       |
 #| organization | varchar(30)      | YES  |     | NULL    |       |
 #| position     | varchar(30)      | YES  |     | NULL    |       |
-#| 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')");
-       $sth->execute or die "-E- DB error: $DBI::errstr\n";
-    }
-}
+       print "\n-> Updating tc_calling table\n";
 
-# EQ_DISTRICT
-#+------------+------------------+------+-----+---------+-------+
-#| Field      | Type             | Null | Key | Default | Extra |
-#+------------+------------------+------+-----+---------+-------+
-#| district   | int(16) unsigned |      | PRI | 0       |       |
-#| name       | varchar(30)      | YES  |     | NULL    |       |
-#| supervisor | int(16) unsigned | YES  |     | NULL    |       |
-#| valid      | tinyint(1)       | YES  |     | NULL    |       |
-#+------------+------------------+------+-----+---------+-------+
-sub update_eq_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");
-    $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->execute or die "-E- DB error: $DBI::errstr\n";
-       $sqlhashref2 = $sth2->fetchrow_hashref;
-       $supervisor_id = $sqlhashref2->{elder};
-       $sth2->finish();
-       $sth2 = $dbh->prepare("update eq_district set supervisor='$supervisor_id' where district='$district'");
-       $sth2->execute or die "-E- DB error: $DBI::errstr\n";
-       $sth2->finish();
-    }
-    $sth->finish();
-}
+       #print "-> Organization Data Dump\n\n";
+       #&print_hash(\%organization_data);
 
-# EQ_COMPANIONSHIP
-#+---------------+------------------+------+-----+---------+-------+
-#| Field         | Type             | Null | Key | Default | Extra |
-#+---------------+------------------+------+-----+---------+-------+
-#| companionship | int(16) unsigned |      |     | 0       |       |
-#| elder         | int(16) unsigned | YES  |     | NULL    |       |
-#| aaronic       | int(16) unsigned | YES  |     | NULL    |       |
-#| district      | int(16) unsigned | YES  |     | NULL    |       |
-#| valid         | tinyint(1)       | YES  |     | NULL    |       |
-#+---------------+------------------+------+-----+---------+-------+
-sub update_eq_companionship_table
-{
-    print "\n-> Updating eq_companionship table\n";
-
-    # First, mark all existing companionships as invalid in case they have been dissolved
-    $sth = $dbh->prepare("update eq_companionship set valid=0");
-    $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";
-                       }
-                   }
-                   $sth->finish();
-                   $sth2->finish();                
-               }
-           }
-       }
-    }
-}
+       # 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";
 
-# EQ_FAMILY
-#+---------------+------------------+------+-----+---------+-------+
-#| Field         | Type             | Null | Key | Default | Extra |
-#+---------------+------------------+------+-----+---------+-------+
-#| family        | int(16) unsigned |      | PRI | 0       |   A   |
-#| 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    |       |
-#| 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'");
+       foreach $index (keys %organization_data)
+       {
+               $name = $organization_data{$index}{'Indiv Name'};
+               $name =~ s/\'/\\'/g; #'
+               $organization = $organization_data{$index}{'Organization'};
+               $organization_by_name{$name} = $organization;
+               $indiv_id = $organization_data{$index}{'Indiv ID'};
+               $organization_by_id{$indiv_id} = $organization;
+               $position = $organization_data{$index}{'Position'};
+               $sustained = $organization_data{$index}{'Sustained'};
+               $sustained =~ /(\S+) (\d+)/; $month=$1; $year=$2;
+               if($name eq "") { next; }
+               
+               $sth = $dbh->prepare("select * from tc_individual where mls_id='$indiv_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";
-               }
+               if($rows != 1) { next; }
+               $individual = $data[0]{'individual'};
 
-                # Now update the elder_id field for this family
-               $sth = $dbh->prepare("select * from eq_elder WHERE name='$family_name'");
+               print "   Adding new Calling: $name -> $position\n";
+               $sth = $dbh->prepare("insert into tc_calling values ('$individual','$organization','$position','$month $year')");
                $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
+
+# TC_COMPANION
+#+----------------------+------------------+------+-----+---------+-------+
+#| Field                | Type             | Null | Key | Default | Extra |
+#+----------------------+------------------+------+-----+---------+-------+
+#| companion            | int(16) unsigned |      | PRI | 0       |       |
+#| individual           | int(16) unsigned | YES  |     | NULL    |       |
+#| companionship        | int(16) unsigned | YES  |     | NULL    |       |
+#| scheduling_priority  | int(10) unsigned | YES  |     | 30      |       |
+#| valid                | tinyint(1)       | YES  |     | NULL    |       |
+#+----------------------+------------------+------+-----+---------+-------+
+#
+# TC_COMPANIONSHIP
+#+----------------------+------------------+------+-----+---------+-------+
+#| Field                | Type             | Null | Key | Default | Extra |
+#+----------------------+------------------+------+-----+---------+-------+
+#| companionship        | int(16) unsigned |      | PRI | 0       |       |
+#| district             | int(16) unsigned | YES  |     | NULL    |       |
+#| valid                | tinyint(1)       | YES  |     | NULL    |       |
+#+----------------------+------------------+------+-----+---------+-------+
+sub update_tc_companionship_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_companionship table\n";
+
+       my %companionships = {};
+
+       # build up hash for each access of companionships and what families they teach
+       foreach $index (keys %hometeaching_data) {
+               $hashref = $hometeaching_data{$index};
+               my $compid = $hometeaching_data{$index}{'Comp ID'};
+               my $household = $hometeaching_data{$index}{'Household'};
+               #print "household = $household  ::  ";
+               if ($household =~ /(.*)\s&.*/) { $household = $1; }
+               #print "household = $household\n";
+               my $district = $hometeaching_data{$index}{'HT District'};
+               my $ht1 = $hometeaching_data{$index}{'Home Teacher 1'};
+               my $ht2 = $hometeaching_data{$index}{'Home Teacher 2'};
+               my $quorum = $hometeaching_data{$index}{'Quorum'};
+               if (($compid ne '') && ($quorum =~ m/($default_stewardship)/i)) {
+                       #print "compid=$compid, household=$household, district=$district, ht1=$ht1, ht2=$ht2, quorum=$quorum\n";
+                       $companionships->{$compid}->{'families'}->{$household} = 1;
+                       $companionships->{$compid}->{'district'} = $district;
+                       #print "$district  $companionships->{$compid}->{'district'}\n";
+                       if ($ht1 ne "") { $companionships->{$compid}->{'companions'}->{$ht1} = 1; }
+                       if ($ht2 ne "") { $companionships->{$compid}->{'companions'}->{$ht2} = 1; }
                }
+       }
 
-               # 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";
+       # loop through each mls companionship and see if there are any changes to companions or familes from what we have in 3rd Counselor
+       for my $companionship (keys %$companionships) {
+               #print "companionship = $companionship\n";
+               my $changed = 0;
+               my $tc_companionship_id = 0;
+               my $district = $companionships->{$companionship}->{'district'};
+               #print "district = $district\n";
+               for my $companion (keys %{$companionships->{$companionship}->{'companions'}}) {
+                       #print "companion = $companion\n";
+                       # see if $companion is in tc_companion
+                       $sth = $dbh->prepare("SELECT * FROM tc_companion AS tc JOIN (tc_individual AS ti, tc_companionship AS tp) WHERE tc.individual=ti.individual AND tc.companionship=tp.companionship AND tp.mls_id=$companionship AND ti.name='$companion' COLLATE latin1_general_cs AND tp.type='H' AND tc.valid=1");
+                       $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) {
+                               print "   $companion is not in tc_companion\n";
+                               $changed = 1;
+                               next;
+                       }
+                       $db_individual = $data[0]->{'individual'};
+                       if ($tc_companionship_id == 0) {
+                               # set tc_companionship to what was in database
+                               $tc_companionship_id = $data[0]->{'companionship'};
+                       } elsif ($tc_companionship_id != $data[0]->{'companionship'}) {
+                               # companionship doesn't match what was in the database, we have a change
+                               print "   companionship doesn't match what is in database, $tc_companionship_id != $data[0]->{'companionship'}\n";
+                               $changed = 1;
+                               last;
+                       }
+
+                       # get list of families assigned to this companionship in database
+                       #print "SELECT * FROM tc_family AS tf JOIN tc_individual AS ti WHERE tf.individual=ti.individual AND tf.companionship=$tc_companionship_id AND tf.valid=1\n";
+                       $sth = $dbh->prepare("SELECT * FROM tc_family AS tf JOIN tc_individual AS ti WHERE tf.individual=ti.individual AND tf.companionship=$tc_companionship_id AND tf.valid=1");
+                       $sth->execute or die "-E- DB error: $DBI::errstr\n";
+                       @data = ();
+                       while ($sqlhashref = $sth->fetchrow_hashref) { push(@data, $sqlhashref); }
+                       for my $row (@data) {
+                               #print "name: $row->{'name'}\n";
+                               #print "companionship: $row->{'companionship'}\n";
+                               # if family is not assigned, we have a change
+                               if (! exists $companionships->{$companionship}->{'families'}->{$row->{'name'}}) {
+                                       print "   family is not assigned, we have a change:  $row->{'name'}\n";
+                                       $changed = 1;
+                                       last;
+                               }
+                               # if companionship assigned to family in database isn't this companionship, we have a change
+                               if ($tc_companionship_id != $row->{'companionship'}) {
+                                       "companionship assigned to this family in the database isn't this companionship:  $tc_companionship_id, $row->{'companionship'}\n";
+                                       $changed = 1;
+                                       last;
+                               }
+                       }
+
+                       # loop through families from HomeTeaching.csv
+                       for my $family (keys %{$companionships->{$companionship}->{'families'}}) {
+                               #print "SELECT * FROM tc_family AS tf JOIN (tc_companionship AS tc, tc_individual AS ti) WHERE tf.companionship=tc.companionship AND tf.individual=ti.individual AND ti.name=\"$family\" COLLATE latin1_general_cs AND tf.valid=1\n";
+                               $sth = $dbh->prepare("SELECT * FROM tc_family AS tf JOIN (tc_companionship AS tc, tc_individual AS ti) WHERE tf.companionship=tc.companionship AND tf.individual=ti.individual AND ti.name=\"$family\" COLLATE latin1_general_cs AND tc.type='H' AND tf.valid=1");
+                               $sth->execute or die "-E- DB error: $DBI::errstr\n";
+                               # if family isn't in tc_family table, we have a change
+                               # if family in tc_family has a different companionship assigned to it, we have a change
+                               # no rows here means we have a change
+                               @familydata = ();
+                               while ($sqlhashref = $sth->fetchrow_hashref) { push(@familydata, $sqlhashref); }
+                               if (scalar @familydata == 0) {
+                                       print "   new family, not in db:  $family\n";
+                                       $changed = 1;
+                                       last;
+                               }
+                       }
+
+                       # last check to break out if we discovered a change
+                       if ($changed == 1)  { last; }
+               }
+
+               # we found a change to the companionship
+               if ($changed == 1) {
+                       # invalidate existing companionship in database
+                       print "   invalidating companionship:$tc_companionship_id\n";
+                       $sth = $dbh->prepare("UPDATE tc_companionship SET valid=0 WHERE companionship='$tc_companionship_id' AND type='H'");
+                       $sth->execute or die "-E- DB error: $DBI::errstr\n";
+                       
+                       # create new companionship in database
+                       print "   creating a new companionship\n";
+                       $sth = $dbh->prepare("INSERT INTO tc_companionship values (NULL,$companionship,$district,'H',1)");
+                       $sth->execute or die "-E- DB error: $DBI::errstr\n";
+                       $comp_id = $dbh->last_insert_id(NULL,NULL,'tc_companionship',NULL);
+                       
+                       # create new companions in database
+                       for my $companion (keys %{$companionships->{$companionship}->{'companions'}}) {
+                               print "   companion=$companion\n";
+                               # if companion exists, preserve scheduling_priority
+                               #print "SELECT tc.* FROM tc_companion AS tc JOIN (tc_individual AS ti, tc_companionship AS tp) WHERE tc.individual=ti.individual AND tc.companionship=tp.companionship AND tp.mls_id=$companionship AND ti.name=\"$companion\" AND tc.valid=1\n";
+                               $sth = $dbh->prepare("SELECT tc.* FROM tc_companion AS tc JOIN (tc_individual AS ti, tc_companionship AS tp) WHERE tc.individual=ti.individual AND tc.companionship=tp.companionship AND tp.mls_id=$companionship AND ti.name=\"$companion\" AND tp.type='H' AND tc.valid=1");
+                               $sth->execute or die "-E- DB error: $DBI::errstr\n";
+                               if ($sqlhashref = $sth->fetchrow_hashref) {
+                                       my $individual = $sqlhashref->{'individual'};
+                                       my $scheduling_priority = $sqlhashref->{'scheduling_priority'};
+                                       print "   adding new companion $individual\n";
+                                       #print "INSERT INTO tc_companion values (NULL,$individual,$comp_id,$scheduling_priority,1)\n";
+                                       $sth = $dbh->prepare("INSERT INTO tc_companion values (NULL,$individual,$comp_id,$scheduling_priority,1)");
+                                       $sth->execute or die "-E- DB error: $DBI::errstr\n";
+                               } else {
+                                       # new companion, create scheduling_priority first
+                                       print "   adding new companion without existing scheduling_priority\n";
+                                       $sth = $dbh->prepare("INSERT INTO tc_scheduling_priority values (NULL,30,'')");
+                                       $sth->execute or die "-E- DB error: $DBI::errstr\n";
+                                       my $scheduling_priority = $dbh->last_insert_id(NULL,NULL,'tc_scheduling_priority',NULL);
+                                       
+                                       #print "SELECT * FROM tc_individual WHERE name=\"$companion\" AND valid='1'\n";
+                                       $sth = $dbh->prepare("SELECT * FROM tc_individual WHERE name=\"$companion\" COLLATE latin1_general_cs AND valid='1'");
+                                       $sth->execute or die "-E- DB error: $DBI::errstr\n";
+                                       if ($sqlhashref = $sth->fetchrow_hashref) {
+                                               my $individual = $sqlhashref->{'individual'};
+                                               #print "INSERT INTO tc_companion values (NULL,$individual,$comp_id,$scheduling_priority,1)\n";
+                                               $sth = $dbh->prepare("INSERT INTO tc_companion values (NULL,$individual,$comp_id,$scheduling_priority,1)");
+                                               $sth->execute or die "-E- DB error: $DBI::errstr\n";
+                                       } else {
+                                               die "trying to add $companion as a companion but doesn't exist in tc_individual - how is this possible!!!\n";
+                                       }
+                               }
+                       }
+                       
+                       # invalidate existing old companions in database
+                       #print "UPDATE tc_companion SET valid=0 WHERE companionship=$tc_companionship_id AND valid=1\n";
+                       $sth = $dbh->prepare("UPDATE tc_companion SET valid=0 WHERE companionship=$tc_companionship_id AND valid=1");
+                       $sth->execute or die "-E- DB error: $DBI::errstr\n";
+                       
+                       # don't worry about linking families, that will be done in update_tc_family_table()
                } else {
-                   print "   -E- Unable to find a family to attach this parent to: $parent_name with hofh_id: $hofh_id\n";
+                       # companionship is the same, just update district in case it changed
+                       $sth = $dbh->prepare("UPDATE tc_companionship SET district=$district WHERE companionship=$tc_companionship_id");
+                       $sth->execute or die "-E- DB error: $DBI::errstr\n";
                }
-               $sth->finish();
-           }
        }
-    }
 }
 
-# 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
+# TC_FAMILY
+#+----------------------+------------------+------+-----+---------+-------+
+#| Field                | Type             | Null | Key | Default | Extra |
+#+----------------------+------------------+------+-----+---------+-------+
+#| family               | int(16) unsigned |      | PRI | 0       |   A   |
+#| individual           | int(16) unsigned | YES  |     | NULL    |       |
+#| companionship        | int(16) unsigned | YES  |     | NULL    |       |
+#| scheduling_priority  | int(10) unsigned | YES  |     | 30      |       |
+#| valid                | tinyint(1)       | YES  |     | NULL    |       |
+#+----------------------+------------------+------+-----+---------+-------+
+sub update_tc_family_table
 {
-    print "\n-> Updating eq_child table\n";
-
-    # Set all records to be invalid. Only mark them as valid if they appear on the new list.
-    $sth = $dbh->prepare("update eq_child set valid=0");
-    $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'};
+       print "\n-> Updating tc_family table\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; }
+       # 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 and companionship=0");
+       $sth->execute or die "-E- DB error: $DBI::errstr\n";
+
+       # find head of households in tc_individual
+       $sth = $dbh->prepare("SELECT * FROM tc_individual WHERE hh_position='Head of Household' and valid=1");
+       $sth->execute or die "-E- DB error: $DBI::errstr\n";
+       my @individual_data = ();
+       while ($sqlhashref = $sth->fetchrow_hashref) { push(@individual_data, $sqlhashref); }
+       my $individual_count = scalar @individual_data;
+       for($i=0;$i<$individual_count;$i++) {
+               $individual = $individual_data[$i]{'individual'};
+               $name = $individual_data[$i]{'name'};
+               
+               $sth2 = $dbh->prepare("SELECT * FROM tc_family WHERE individual='$individual'");
+               $sth2->execute or die "-E- DB error: $DBI::errstr\n";
                
-               # 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); }
+               while($sqlhashref2 = $sth2->fetchrow_hashref) { push(@data, $sqlhashref2); }
                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";
+
+               if($rows == 0) {
+                       # No existing records found for this family, make a new entry
+                       print "   Adding new Family: $name\n";
+                       $sth2 = $dbh->prepare("INSERT INTO tc_family VALUES (NULL,'$individual','0',NULL,1)");
+                       $sth2->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: $name\n";
+                       $sth2 = $dbh->prepare("UPDATE tc_family SET valid='1' WHERE individual='$individual'");
+                       $sth2->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";
+                       # More than one record was found. Error! This shouldn't happen.
+                       print "   -E- More than one record found ($rows) for family name: $name\n";
+               }
+               
+               # Now update the hometeaching field for this family
+               foreach $index (keys %hometeaching_data)
+               {
+                       $hashref = $hometeaching_data{$index};
+                       foreach $key (keys %$hashref) {
+                               if($key =~ /Quorum/i &&
+                                  $hometeaching_data{$index}{$key} =~ /Elders/i &&
+                                  $hometeaching_data{$index}{'Household'} =~ /$name/i &&
+                                  $data[0]->{companionship} != $hometeaching_data{$index}{'Comp ID'}
+                                 )
+                               {
+                                       print "   Updating hometeaching assignment for $name family\n";
+                                       $companionship = $hometeaching_data{$index}{'Comp ID'};
+                                       $sth2 = $dbh->prepare("SELECT * FROM tc_companionship WHERE mls_id=$companionship AND valid=1");
+                                       $sth2->execute or die "-E- DB error: $DBI::errstr\n";
+                                       if ($sqlhashref = $sth2->fetchrow_hashref) {
+                                               $companionship = $sqlhashref->{'companionship'};
+                                               $sth2 = $dbh->prepare("update tc_family set companionship='$companionship' where individual='$individual'");
+                                               $sth2->execute or die "-E- DB error: $DBI::errstr\n";
+                                       } else {
+                                               die "-E- companionship doesn't exist for family!\n";
+                                       }
+                               }
+                       }
                }
                $sth->finish();
-           }
        }
-    }
 }
 
-# EQ_VISIT
+# TC_VISIT
 #+----------------+------------------+------+-----+---------+-------+
 #| Field          | Type             | Null | Key | Default | Extra |
 #+----------------+------------------+------+-----+---------+-------+
@@ -672,9 +527,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;
@@ -691,8 +546,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 AS tf JOIN tc_individual AS ti WHERE tf.individual=ti.individual AND ti.name=\"$family_name\" COLLATE latin1_general_cs AND tf.valid=1");
                $sth->execute or die "-E- DB error: $DBI::errstr\n";
                my @family_data = ();
                while($sqlhashref = $sth->fetchrow_hashref) { push(@family_data, $sqlhashref); }
@@ -705,7 +560,7 @@ sub update_eq_visit_table
                #print "family_id = $family_id\n";
                #print "comp_id = $comp_id\n";
                
-               # ignore visits that weren't done by the EQ
+               # ignore visits that weren't done by the quorum
                if ($comp_id == 0) { next; }
                
                # retrieve the month header if not already done
@@ -729,7 +584,7 @@ sub update_eq_visit_table
                #print "$month_header\n";
                #print $hometeaching_stats_data{$index}{$month_header};
                #print "\n";
-               foreach $i (reverse(0..$#history)) {
+               foreach $i (reverse(0..$#history-1)) {
                        # went back a calendar year, decrement $data_year
                        if ($months{$data_months[$i]} > $data_month)
                        {
@@ -740,8 +595,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 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); }
@@ -749,18 +604,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', 'H')");
                                        $sth->execute or die "-E- DB error: $DBI::errstr\n";
                                }
                        }
@@ -771,37 +626,154 @@ 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)
+       {
+               $mls_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 &&
+                          $mls_id != $newhashref->{$newindex}{'Indiv ID'})
+                       {
+                               print "-W- Indiv ID for $full_name changed from $mls_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_organization_class_data
+{
+       print "\n-> Updating organization class info in tc_individual table\n";
+
+       foreach $index (keys %organization_class_data)
        {
-           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;
-           }
+               # get name and organization info for each individual
+               $name = $organization_class_data{$index}{'Preferred Name'};
+               $fullname = $organization_class_data{$index}{'Full Name'};
+               $org_class = $organization_class_data{$index}{'Organization Class'};
+
+               if ($org_class =~ m/Elder/i) {
+                       #print "   $name:  Elder\n";
+                       $sth = $dbh->prepare("update tc_individual set steward='Elder' where name=\"$name\" COLLATE latin1_general_cs AND fullname=\"$fullname\" COLLATE latin1_general_cs");
+                       $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_individual set steward='High Priest' where name=\"$name\" COLLATE latin1_general_cs AND fullname=\"$fullname\" COLLATE latin1_general_cs");
+                       $sth->execute or die "-E- DB error: $DBI::errstr\n";
+               }
        }
-    }
-    
-    return $found_problem;
+}
+
+sub update_tc_scheduling_priority_table
+{
+       print "\n-> Updating scheduling priority table\n";
+       
+       # individuals
+       $sth = $dbh->prepare("select * from tc_individual where steward='$default_stewardship' and valid=1");
+       $sth->execute or die "-E- DB error: $DBI::errstr\n";
+       while($sqlhashref = $sth->fetchrow_hashref) {
+               $individual = $sqlhashref->{individual};
+               $scheduling_priority = $sqlhashref->{scheduling_priority};
+               if ($scheduling_priority == 'NULL')
+               {
+                       $sth2 = $dbh->prepare("insert into tc_scheduling_priority values (NULL, 30, '')");
+                       $sth2->execute or die "-E- DB error: $DBI::errstr\n";
+                       $scheduling_priority = $dbh->last_insert_id(NULL,NULL,'tc_scheduling_priority',NULL);
+                       $sth2 = $dbh->prepare("update tc_individual set scheduling_priority=$scheduling_priority where individual=$individual");
+                       $sth2->execute or die "-E- DB error: $DBI::errstr\n";
+               }
+       }
+       &remove_obsolete_scheduling_priority("tc_individual");
+       
+       # families
+       $sth = $dbh->prepare("select tf.scheduling_priority, tf.family from tc_family AS tf JOIN tc_individual AS ti ON tf.individual=ti.individual and tf.companionship!='0' and tf.valid=1");
+       $sth->execute or die "-E- DB error: $DBI::errstr\n";
+       while($sqlhashref = $sth->fetchrow_hashref) {
+               $family = $sqlhashref->{family};
+               $scheduling_priority = $sqlhashref->{scheduling_priority};
+               #print "$family   $scheduling_priority\n";
+               if ($scheduling_priority == 'NULL')
+               {
+                       $sth2 = $dbh->prepare("insert into tc_scheduling_priority values (NULL, 30, '')");
+                       $sth2->execute or die "-E- DB error: $DBI::errstr\n";
+                       $scheduling_priority = $dbh->last_insert_id(NULL,NULL,'tc_scheduling_priority',NULL);
+                       $sth2 = $dbh->prepare("update tc_family set scheduling_priority=$scheduling_priority where family=$family");
+                       $sth2->execute or die "-E- DB error: $DBI::errstr\n";
+               }
+       }
+       &remove_obsolete_scheduling_priority("tc_family");
+       
+       # companions
+       $sth = $dbh->prepare("select tc.individual, tc.scheduling_priority from tc_companion AS tc JOIN tc_individual AS ti ON tc.individual=ti.individual and (ti.steward='$default_stewardship' or ti.steward='') and tc.valid=1");
+       $sth->execute or die "-E- DB error: $DBI::errstr\n";
+       while($sqlhashref = $sth->fetchrow_hashref) {
+               $individual = $sqlhashref->{individual};
+               $scheduling_priority = $sqlhashref->{scheduling_priority};
+               #print "$individual   $scheduling_priority\n";
+               if ($scheduling_priority == 'NULL')
+               {
+                       $sth2 = $dbh->prepare("insert into tc_scheduling_priority values (NULL, 30, '')");
+                       $sth2->execute or die "-E- DB error: $DBI::errstr\n";
+                       $scheduling_priority = $dbh->last_insert_id(NULL,NULL,'tc_scheduling_priority',NULL);
+                       #print "update tc_companion set scheduling_priority=$scheduling_priority where individual=$individual\n";
+                       $sth2 = $dbh->prepare("update tc_companion set scheduling_priority=$scheduling_priority where individual=$individual");
+                       $sth2->execute or die "-E- DB error: $DBI::errstr\n";
+               }
+       }
+       &remove_obsolete_scheduling_priority("tc_companion");
+}
+
+sub remove_obsolete_scheduling_priority
+{
+       my $table_name = $_[0];
+
+       #print "\n-> Cleaning $table_name\n";
+       
+       $sth = $dbh->prepare("SELECT * FROM $table_name WHERE valid=0");
+       $sth->execute or die "-E- DB error: $DBI::errstr\n";
+       while($sqlhashref = $sth->fetchrow_hashref) {
+               $scheduling_priority = $sqlhashref->{scheduling_priority};
+               $individual = $sqlhashref->{individual};
+               if ($scheduling_priority != "NULL") {
+                       #print "SELECT * FROM $table_name WHERE scheduling_priority=$scheduling_priority AND valid=1\n";
+                       $sth2 = $dbh->prepare("SELECT * FROM $table_name WHERE scheduling_priority=$scheduling_priority AND valid=1");
+                       $sth2->execute or die "-E- DB error: $DBI::errstr\n";
+                       if (!($sqlhashref2 = $sth2->fetchrow_hashref)) {
+                               #print "$name\n";
+                               # set scheduling_priority to NULL
+                               #print "UPDATE $table_name SET scheduling_priority=NULL WHERE individual=$individual\n";
+                               $sth3 = $dbh->prepare("UPDATE $table_name SET scheduling_priority=NULL WHERE individual=$individual");
+                               $sth3->execute or die "-E- DB error: $DBI::errstr\n";
+                               
+                               # remove entry from tc_scheduling_priority
+                               #print "DELETE FROM tc_scheduling_priority WHERE scheduling_priority=$scheduling_priority\n";
+                               $sth3 = $dbh->prepare("DELETE FROM tc_scheduling_priority WHERE scheduling_priority=$scheduling_priority");
+                               $sth3->execute or die "-E- DB error: $DBI::errstr\n";
+                               $sth3->finish();
+                       }
+                       $sth2->finish();
+               }
+       }
+       $sth->finish();
 }
 
 ######################################################################
@@ -818,34 +790,35 @@ $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;
+       }
 }
 
 ###################################################
 # Process command line options
+our $datadir;
 if(defined $opt_n) { $datadir = $opt_n; }
 else { $datadir = shift(@ARGV); }
 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);
+&optional_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);
@@ -854,28 +827,26 @@ 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();
+# Now update the various DB tables
+&update_tc_individual_table();
+&update_tc_calling_table();
+&update_tc_companionship_table();
+&update_tc_family_table();
+&update_tc_visit_table();
+&update_organization_class_data();
+&update_tc_scheduling_priority_table();
 
 print "\n-> Import Successful! DONE...\n";