X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=import_ward_data;h=ef1c7eab0e862ed52fd2ce3dbcda3668b36ce3b6;hb=0a859add5e1ba3f0f19114fb7cde8d93fbf61097;hp=22fa69185d6e8ef2bc1371a63d50b8a3ce9c5bec;hpb=fe1acd0acba1dabf6685fed613bf21f967c2b25d;p=eq%2F.git

diff --git a/import_ward_data b/import_ward_data
index 22fa691..ef1c7ea 100755
--- a/import_ward_data
+++ b/import_ward_data
@@ -83,6 +83,11 @@ sub print_hash
 sub update_eq_aaronic_table
 {
     print "-> 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};
@@ -105,12 +110,12 @@ sub update_eq_aaronic_table
 		    $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 if it is valid
-		    if($data[0]->{valid} == 1) {
-			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";
-		    }
+		    # 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";
@@ -249,7 +254,7 @@ sub update_eq_companionship_table
 			$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"; }
+			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'};
@@ -260,7 +265,7 @@ sub update_eq_companionship_table
 		    my $rows = scalar @data;
 		    if($rows == 0) {
 			# No existing records found for this companionship, make a new entry
-			print "   Adding Elder to companionship: $elder_name -> $id\n";
+			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 {
@@ -302,6 +307,7 @@ sub update_eq_companionship_table
 #| 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    |       |
 #| companionship | int(16) unsigned | YES  |     | NULL    |       |
 #| valid         | tinyint(1)       | YES  |     | NULL    |       |
 #+---------------+------------------+------+-----+---------+-------+
@@ -312,6 +318,8 @@ sub update_eq_family_table
     # 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)
     {
@@ -321,9 +329,10 @@ sub update_eq_family_table
 		$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='$family_name'");
+		$sth = $dbh->prepare("select * from eq_family where name_id='$name_id'");
 		$sth->execute or die "-E- DB error: $DBI::errstr\n";
 		my @data = ();
 		while($sqlhashref = $sth->fetchrow_hashref) { push(@data, $sqlhashref); }
@@ -332,14 +341,14 @@ 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','0',1)");
+		    $sth = $dbh->prepare("insert into eq_family values (NULL,$id,'$family_name','$name_id','0',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='$family_name'");
+		    $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='$family_name'");
+		    $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.
@@ -356,13 +365,13 @@ sub update_eq_family_table
 			}
 			if($key =~ /Quorum/i &&
 			   $hometeaching_data{$index}{$key} =~ /Elders/i &&
-			   $hometeaching_data{$index}{'Household'} =~ /$family_name/ &&
+			   $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='$family_name'");
+			    $sth = $dbh->prepare("update eq_family set companionship='$companionship' where name_id='$name_id'");
 			    $sth->execute or die "-E- DB error: $DBI::errstr\n";
 			}
 		    }