X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=import_ward_data;h=405784a97f8dd379f05159485e27625d24c59fdf;hb=3ceab85dc8b7434df82b8a42d70a1ed491409716;hp=423223b458721dcaf4b0f507a79087f926e23206;hpb=fcd809d95772f33ac232309c3caa3d0c85307963;p=eq%2F.git

diff --git a/import_ward_data b/import_ward_data
index 423223b..405784a 100755
--- a/import_ward_data
+++ b/import_ward_data
@@ -351,6 +351,7 @@ sub update_eq_companionship_table
 #| hofh_id       | int(16) unsigned | YES  |     | NULL    |       |
 #| name          | varchar(30)      | YES  |     | NULL    |       |
 #| name_id       | varchar(30)      | YES  |     | NULL    |       |
+#| elder_id      | int(16) unsigned | YES  |     | NULL    |       |
 #| companionship | int(16) unsigned | YES  |     | NULL    |       |
 #| visit_pri     | int(10) unsigned | YES  |     | 1       |       |
 #| visit_notes   | varchar(128)     | YES  |     | NULL    |       |
@@ -386,7 +387,7 @@ sub update_eq_family_table
 		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',1,1,'')");
+		    $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
@@ -399,6 +400,17 @@ sub update_eq_family_table
 		    # More than one record was found. Error! This shouldn't happen.
 		    print "   -E- More than one record found ($rows) for family name: $family_name\n";
 		}
+
+                # Now update the elder_id field for this family
+		$sth = $dbh->prepare("select * from eq_elder WHERE name='$family_name'");
+		$sth->execute or die "-E- DB error: $DBI::errstr\n";
+		while($sqlhashref = $sth->fetchrow_hashref) {
+		    $elder_id = $sqlhashref->{elder};
+		    print "   Updating family elder_id: $family_name -> $elder_id\n";
+		    $sth = $dbh->prepare("update eq_family set elder_id=$elder_id where name_id='$name_id'");
+		    $sth->execute or die "-E- DB error: $DBI::errstr\n";
+		}
+		
 		# Now update the hometeaching field for this family
 		foreach $index (keys %hometeaching_data)
 		{
@@ -510,9 +522,11 @@ sub update_eq_parent_table
 		    $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";
-	    } else {
+		} 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\n";
+		    print "   -E- More than one record found with same parent name: $parent_name with hofh_id: $hofh_id\n";
+		} else {
+		    print "   -E- Unable to find a family to attach this parent to: $parent_name with hofh_id: $hofh_id\n";
 		}
 		$sth->finish();
 	    }