Added new Last PPI column

[eq/.git] / import_ward_data

diff --git a/import_ward_data b/import_ward_data
index d54f8fc77d7429cce6bd0caf34fb4ec0fc4f96ce..8cf3d0d061ca6e0096b89c96449b08b7a2ada10a 100755 (executable)
--- a/import_ward_data
+++ b/import_ward_data
@@ -82,7 +82,7 @@ sub print_hash
 #+-------+--------------------+------+-----+---------+-------+
 sub update_eq_aaronic_table
 {
-    print "-> Updating eq_aaronic table\n";
+    print "\n-> Updating eq_aaronic table\n";
 
     # Set all records to be invalid. Only mark them as valid if they appear on the new list.
     $sth = $dbh->prepare("update eq_aaronic set valid=0");
@@ -128,17 +128,21 @@ sub update_eq_aaronic_table
 }
 
 # EQ_ELDER
-#+------------+------------------+------+-----+---------+-------+
-#| Field      | Type             | Null | Key | Default | Extra |
-#+------------+------------------+------+-----+---------+-------+
-#| elder      | int(16) unsigned |      | PRI | 0       |   A   |
-#| name       | varchar(60)      | YES  |     | NULL    |       |
-#| phone      | varchar(12)      | YES  |     | NULL    |       |
-#| valid      | tinyint(1)       | YES  |     | NULL    |       |
-#+------------+------------------+------+-----+---------+-------+
+#+-------------+------------------+------+-----+---------+----------------+
+#| Field       | Type             | Null | Key | Default | Extra          |
+#+-------------+------------------+------+-----+---------+----------------+
+#| elder       | int(16) unsigned |      | PRI | NULL    | auto_increment |
+#| name        | varchar(60)      | YES  |     | NULL    |                |
+#| phone       | varchar(12)      | YES  |     | NULL    |                |
+#| ppi_pri     | int(10) unsigned | YES  |     | 1       |                |
+#| visit_pri   | int(10) unsigned | YES  |     | 1       |                |
+#| ppi_notes   | varchar(128)     | YES  |     | NULL    |                |
+#| visit_notes | varchar(128)     | YES  |     | NULL    |                |
+#| valid       | tinyint(1)       | YES  |     | NULL    |                |
+#+-------------+------------------+------+-----+---------+----------------+
 sub update_eq_elder_table
 {
-    print "-> Updating eq_elder table\n";
+    print "\n-> Updating eq_elder table\n";
 
     # Set all records to be invalid. Only mark them as valid if they appear on the new list.
     $sth = $dbh->prepare("update eq_elder set valid=0");
@@ -161,7 +165,7 @@ sub update_eq_elder_table
                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,'$elder_name','$phone',1)");
+                   $sth = $dbh->prepare("insert into eq_elder values (NULL,'$elder_name','$phone','1','1','','',1)");
                    $sth->execute or die "-E- DB error: $DBI::errstr\n";
                } elsif($rows == 1) {
                    # An existing record was found for this elder, update it
@@ -197,7 +201,7 @@ sub update_eq_elder_table
 #+--------------+------------------+------+-----+---------+-------+
 sub update_eq_calling_table()
 {
-    print "-> Updating eq_calling table\n";
+    print "\n-> Updating eq_calling table\n";
 
     #print "-> Organization Data Dump\n\n";
     #&print_hash(\%organization_data);
@@ -237,7 +241,7 @@ sub update_eq_district_table
 {
     # Districts should be created by hand. This subroutine only
     # updates the supervisor's ID in each district.
-    print "-> Updating eq_district table\n";
+    print "\n-> Updating eq_district table\n";
     $sth = $dbh->prepare("select * from eq_district");
     $sth->execute or die "-E- DB error: $DBI::errstr\n";
     while($sqlhashref = $sth->fetchrow_hashref) {
@@ -267,7 +271,7 @@ sub update_eq_district_table
 #+---------------+------------------+------+-----+---------+-------+
 sub update_eq_companionship_table
 {
-    print "-> Updating eq_companionship table\n";
+    print "\n-> Updating eq_companionship table\n";
 
     # First, mark all existing companionships as invalid in case they have been dissolved
     $sth = $dbh->prepare("update eq_companionship set valid=0");
@@ -354,7 +358,7 @@ sub update_eq_companionship_table
 #+---------------+------------------+------+-----+---------+-------+
 sub update_eq_family_table
 {
-    print "-> Updating eq_family table\n";
+    print "\n-> Updating eq_family table\n";
 
     # Set all records to be invalid. Only mark them as valid if they appear on the new list.
     $sth = $dbh->prepare("update eq_family set valid=0");
@@ -401,8 +405,11 @@ sub update_eq_family_table
                    $hashref = $hometeaching_data{$index};
                    foreach $key (keys %$hashref) {
                        if($hometeaching_data{$index}{'Household'} =~ /(\S+)\s+(\S+),\s+(\S+)\s+(.*)/) {
-                           print "I: Adjusting hometeaching match from: $hometeaching_data{$index}{'Household'} to $1, $3 $4\n";
-                           $hometeaching_data{$index}{'Household'} = "$1, $3 $4";
+                           $a = $1; $b = $2; $c = $3; $d = $4;
+                           if($family_name =~ /$a/ && $hometeaching_data{$index}{'Household'} !~ /$family_name/i) { 
+                               print "I: Adjusting hometeaching match from: $hometeaching_data{$index}{'Household'} to $a, $c $d\n";
+                               $hometeaching_data{$index}{'Household'} = "$a, $c $d";
+                           }
                        }
                        if($key =~ /Quorum/i &&
                           $hometeaching_data{$index}{$key} =~ /Elders/i &&
@@ -438,7 +445,7 @@ sub update_eq_family_table
 #+----------+------------------+------+-----+---------+-------+
 sub update_eq_parent_table
 {
-    print "-> Updating eq_parent table\n";
+    print "\n-> Updating eq_parent table\n";
 
     # Set all records to be invalid. Only mark them as valid if they appear on the new list.
     $sth = $dbh->prepare("update eq_parent set valid=0");
@@ -523,7 +530,7 @@ sub update_eq_parent_table
 #+----------+------------------+------+-----+---------+-------+
 sub update_eq_child_table
 {
-    print "-> Updating eq_child table\n";
+    print "\n-> Updating eq_child table\n";
 
     # Set all records to be invalid. Only mark them as valid if they appear on the new list.
     $sth = $dbh->prepare("update eq_child set valid=0");
@@ -653,7 +660,7 @@ if(defined $opt_o) {
 # Process command line options
 if(defined $opt_n) { $datadir = $opt_n; }
 else { $datadir = shift(@ARGV); }
-print "-> Processing all ward data files in $datadir\n";
+print "\n-> Processing all ward data files in $datadir\n";
 
 ###################################################
 # Parse Ward Data Files