X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=import_ward_data;h=6a1e121ed9acd45c1f1d77dcb4cc1c24eb12ad1d;hb=a09d03a95920d3698aa9c1dc7556b44451cfd24a;hp=c3041dfbf45e0846749daf17e082c8b1c9b3f5b5;hpb=f02dbfe276a992b3b1c674cc1b4075fd97c875e2;p=eq%2F.git

diff --git a/import_ward_data b/import_ward_data
index c3041df..6a1e121 100755
--- a/import_ward_data
+++ b/import_ward_data
@@ -121,6 +121,7 @@ sub update_eq_aaronic_table
 #+------------+------------------+------+-----+---------+-------+
 #| elder      | int(16) unsigned |      | PRI | 0       |   A   |
 #| name       | varchar(60)      | YES  |     | NULL    |       |
+#| phone      | varchar(12)      | YES  |     | NULL    |       |
 #| valid      | tinyint(1)       | YES  |     | NULL    |       |
 #+------------+------------------+------+-----+---------+-------+
 sub update_eq_elder_table
@@ -137,6 +138,9 @@ sub update_eq_elder_table
 	foreach $key (keys %$hashref) {
 	    if($key =~ /Priesthood/i && $membership_data{$index}{$key} =~ /Elder/i) {
 		$elder_name = $membership_data{$index}{'Preferred Name'};
+		$phone = $membership_data{$index}{'Phone 1'};
+		if($phone =~ /(\d\d\d-\d\d\d\d)/) { $phone = "970-$1"; }
+		if($phone =~ /^\(\d\d\d\) (\d\d\d-\d\d\d\d)/) { $phone = "$1-$2"; }
 		$sth = $dbh->prepare("select * from eq_elder where name='$elder_name'");
 		$sth->execute or die "-E- DB error: $DBI::errstr\n";
 		my @data = ();
@@ -145,13 +149,19 @@ 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',1)");
+		    $sth = $dbh->prepare("insert into eq_elder values (NULL,'$elder_name','$phone',1)");
 		    $sth->execute or die "-E- DB error: $DBI::errstr\n";
 		} elsif($rows == 1) {
 		    # An existing record was found for this elder, update it
 		    print "   Updating existing Elder: $elder_name\n";
 		    $sth = $dbh->prepare("update eq_elder set valid=1 where name='$elder_name'");
 		    $sth->execute or die "-E- DB error: $DBI::errstr\n";
+		    if($phone ne "") { 
+			$sth = $dbh->prepare("update eq_elder set phone='$phone' where name='$elder_name'");
+		    } else {
+			$sth = $dbh->prepare("update eq_elder set phone=NULL 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";
@@ -237,7 +247,7 @@ sub update_eq_companionship_table
 		    } 
 		    $id = $hometeaching_data{$index}{'Comp ID'};
 		    $district = $hometeaching_data{$index}{'HT District'};
-		    $sth = $dbh->prepare("select * from eq_companionship where elder='$elder' and aaronic='$aaronic'");
+		    $sth = $dbh->prepare("select * from eq_companionship where elder='$elder' and aaronic='$aaronic' and companionship='$id'");
 		    $sth->execute or die "-E- DB error: $DBI::errstr\n";
 		    my @data = ();
 		    while($sqlhashref = $sth->fetchrow_hashref) { push(@data, $sqlhashref); }
@@ -253,19 +263,19 @@ sub update_eq_companionship_table
 			$sth2->execute or die "-E- DB error: $DBI::errstr\n";
 			if($elder ne "NULL") {
 			    print "   Updating Companionship with Elder: $elder_name ($elder) -> $id\n";
-			    $sth = $dbh->prepare("update eq_companionship set district='$district' where elder='$elder'");
-			    $sth->execute or die "-E- DB error: $DBI::errstr\n";
-			    $sth = $dbh->prepare("update eq_companionship set companionship='$id' where elder='$elder'");
-			    $sth->execute or die "-E- DB error: $DBI::errstr\n";
-			    $sth = $dbh->prepare("update eq_companionship set valid=1 where elder='$elder'");
-			    $sth->execute or die "-E- DB error: $DBI::errstr\n";
+			    $sth = $dbh->prepare("update eq_companionship set district='$district' where elder='$elder' and companionship='$id'");
+			    $sth->execute or die "-E- DB error 'district': $DBI::errstr\n";
+			    $sth = $dbh->prepare("update eq_companionship set elder='$elder' where elder='$elder' and companionship='$id'");
+			    $sth->execute or die "-E- DB error 'elder': $DBI::errstr\n";
+			    $sth = $dbh->prepare("update eq_companionship set valid=1 where elder='$elder' and companionship='$id'");
+			    $sth->execute or die "-E- DB error 'valid': $DBI::errstr\n";
 			} else {
 			    print "   Updating Companionship with Aaronic: $elder_name ($aaronic) -> $id\n";
-			    $sth = $dbh->prepare("update eq_companionship set district='$district' where aaronic='$aaronic'");
+			    $sth = $dbh->prepare("update eq_companionship set district='$district' where aaronic='$aaronic' and companionship='$id'");
 			    $sth->execute or die "-E- DB error: $DBI::errstr\n";
-			    $sth = $dbh->prepare("update eq_companionship set companionship='$id' where aaronic='$aaronic'");
+			    $sth = $dbh->prepare("update eq_companionship set aaronic='$aaronic' where aaronic='$aaronic' and companionship='$id'");
 			    $sth->execute or die "-E- DB error: $DBI::errstr\n";
-			    $sth = $dbh->prepare("update eq_companionship set valid=1 where aaronic='$aaronic'");
+			    $sth = $dbh->prepare("update eq_companionship set valid=1 where aaronic='$aaronic' and companionship='$id'");
 			    $sth->execute or die "-E- DB error: $DBI::errstr\n";			    
 			    $sth = $dbh->prepare("update eq_aaronic set valid=1 where aaronic='$aaronic'");
 			    $sth->execute or die "-E- DB error: $DBI::errstr\n";