X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=import_ward_data;h=8a7983b4d986b19380cd7437db3a402fae96d057;hb=0ba310089373dd8c0ddb7091c56a5b7c15c249b2;hp=2c95e99ef64990d521fb19236fc7ed5f2bafbd18;hpb=7bb95f6080564d04a568f55287e17c7fad88c7d0;p=eq%2F.git

diff --git a/import_ward_data b/import_ward_data
index 2c95e99..8a7983b 100755
--- a/import_ward_data
+++ b/import_ward_data
@@ -77,11 +77,17 @@ sub print_hash
 #+-------+--------------------+------+-----+---------+-------+
 #| aaronic | int(16) unsigned |      | PRI | 0       |   A   |
 #| name    | varchar(60)      | YES  |     | NULL    |       |
+#| phone   | varchar(12)      | YES  |     | NULL    |       |
 #| valid   | tinyint(1)       | YES  |     | NULL    |       |
 #+-------+--------------------+------+-----+---------+-------+
 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};
@@ -90,6 +96,9 @@ sub update_eq_aaronic_table
 	       ($membership_data{$index}{$key} =~ /^Teacher\s*$/i ||
 		$membership_data{$index}{$key} =~ /^Priest\s*$/i)) {
 		$aaronic_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_aaronic where name='$aaronic_name'");
 		$sth->execute or die "-E- DB error: $DBI::errstr\n";
 		my @data = ();
@@ -98,13 +107,15 @@ sub update_eq_aaronic_table
 		if($rows == 0) {
 		    # No existing records found for this aaronic, make a new entry
 		    print "   Adding new Aaronic: $aaronic_name\n";
-		    $sth = $dbh->prepare("insert into eq_aaronic values (NULL,'$aaronic_name',1)");
+		    $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";
-		    }
+		    # 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";
@@ -254,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 {
@@ -306,6 +317,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)
     {