removed more references to EQ

[eq/.git] / bin / import_ward_data

diff --git a/bin/import_ward_data b/bin/import_ward_data
index 909f3ba9490e7a47d63a8e714b773a05f216b46c..57a7f51ae7dcc9fd5bbca49a35b6425a8c5149b8 100755 (executable)
--- a/bin/import_ward_data
+++ b/bin/import_ward_data
@@ -116,8 +116,8 @@ sub print_hash
 #| priesthood  | enum             | 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    |                |
+#| hti_pri     | int(10) unsigned | YES  |     | 1       |                |
+#| hti_notes   | varchar(128)     | YES  |     | NULL    |                |
 #| attending   | tinyint(1)       | YES  |     | 0       |                |
 #| valid       | tinyint(1)       | YES  |     | NULL    |                |
 #+-------------+------------------+------+-----+---------+----------------+
@@ -134,8 +134,6 @@ sub update_tc_indiv_table
                $hashref = $membership_data{$index};
                $id = $membership_data{$index}{'Indiv ID'};
                $indiv_name = $membership_data{$index}{'Preferred Name'};
-               $birthday = $membership_data{$index}{'Birth'};
-               $birthday =~ /(\d+) (\S+) (\d+)/; $day=$1; $month=$monthname2num{$2}; $year=$3;
                $address = $membership_data{$index}{'Street 1'};
                if($membership_data{$index}{'Street 2'} ne "") { 
                        $address .= " " . $membership_data{$index}{'Street 2'};
@@ -162,7 +160,7 @@ sub update_tc_indiv_table
                if($rows == 0) {
                        # No existing records found for this indiv, make a new entry
                        print "   Adding new indiv: $indiv_name\n";
-                       $sth = $dbh->prepare("insert into tc_indiv values (NULL,'$id',\"$indiv_name\",'$year-$month-$day','$address','$phone','$email','','$hhposition','$priesthood','','$default_interview_pri','','$default_interview_pri','',$attending,1)");
+                       $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 indiv, update it
@@ -175,12 +173,6 @@ sub update_tc_indiv_table
                                $sth = $dbh->prepare("update tc_indiv set phone=NULL where name=\"$indiv_name\"");
                        }
                        $sth->execute or die "-E- DB error: $DBI::errstr\n";
-                       if($birthday ne "") { 
-                               $sth = $dbh->prepare("update tc_indiv set birthday='$year-$month-$day' where name=\"$indiv_name\"");
-                       } else {
-                               $sth = $dbh->prepare("update tc_indiv set birthday=NULL where name=\"$indiv_name\"");
-                       }
-                       $sth->execute or die "-E- DB error: $DBI::errstr\n";
                        if($address ne "") { 
                                $sth = $dbh->prepare("update tc_indiv set address='$address' where name=\"$indiv_name\"");
                        } else {
@@ -482,7 +474,7 @@ sub update_tc_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