Fixed HT apps to sort families under a companionship in alphabetical order.

[eq/.git] / import_ward_data

diff --git a/import_ward_data b/import_ward_data
index 22fa69185d6e8ef2bc1371a63d50b8a3ce9c5bec..8a7983b4d986b19380cd7437db3a402fae96d057 100755 (executable)
--- 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";
@@ -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 {
@@ -312,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)
     {