X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=bin%2Fimport_ward_data;h=bf970a2565b17e1cc9834e838fb4586c4976517a;hb=4800cbc5c11e33d6f32ea72c80c07a71ab02c158;hp=9b830aada27441ac44ca6c56ff56bbbb3f718d05;hpb=96aa338c7566eb9eec4e2200140358166b223790;p=eq%2F.git

diff --git a/bin/import_ward_data b/bin/import_ward_data
index 9b830aa..bf970a2 100755
--- a/bin/import_ward_data
+++ b/bin/import_ward_data
@@ -131,8 +131,10 @@ sub update_eq_aaronic_table
 #| 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       |                |
@@ -173,7 +175,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','','1','',$attending,1)");
+		    $sth = $dbh->prepare("insert into eq_elder values (NULL,'$id','$elder_name','$phone','','1','','1','',$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
@@ -188,6 +190,8 @@ sub update_eq_elder_table
 		    $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";
 		} 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";
@@ -447,16 +451,6 @@ sub update_eq_family_table
 			    $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";
-			    
-			    # In addition to changing the hometeaching assignment, update the eq_visit table
-			    # so that all previous visits made by the old hometeaching companionship, get
-			    # updated with the id of the new companionship. This will allow us to go in and
-			    # edit the history as needed for the family being hometaught under their new
-			    # companionship. Otherwise, we will not be able to update this history.
-			    #$family_id = $data[0]->{family};
-			    #print "   update eq_visit set companionship='$companionship' where family='$family_id' and companionship!='0'\n";
-			    #$sth = $dbh->prepare("update eq_visit set companionship='$companionship' where companionship='$old_companionship'");
-			    #$sth->execute or die "-E- DB error: $DBI::errstr\n";
 			}
 		    }
 		}