From: Alan Jack Pippin <ajp@pippin.(none)>
Date: Tue, 31 Jan 2006 06:57:14 +0000 (-0700)
Subject: Fixed bug in updating eq_aaronic table.
X-Git-Tag: release_0_1_0~60
X-Git-Url: http://git.pippins.net/embedvideo/images/%27%20.%20%24this-%3Ephpgw_js_url%20.%20%27/jscalendar/%7Bview%7D?a=commitdiff_plain;h=1d4914ccac2bc2b7f258c9551b2e01db88580f7a;p=eq%2F.git

Fixed bug in updating eq_aaronic table.
---

diff --git a/import_ward_data b/import_ward_data
index 22fa691..a691a91 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";