X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=import_ward_data;h=423223b458721dcaf4b0f507a79087f926e23206;hb=fcd809d95772f33ac232309c3caa3d0c85307963;hp=c45feafde8a73c6410877a57165a3674dc112522;hpb=7af932f11f7025c37945987840922f1786c4de5c;p=eq%2F.git

diff --git a/import_ward_data b/import_ward_data
index c45feaf..423223b 100755
--- a/import_ward_data
+++ b/import_ward_data
@@ -82,7 +82,7 @@ sub print_hash
 #+-------+--------------------+------+-----+---------+-------+
 sub update_eq_aaronic_table
 {
-    print "-> Updating eq_aaronic table\n";
+    print "\n-> 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");
@@ -93,7 +93,8 @@ sub update_eq_aaronic_table
 	$hashref = $membership_data{$index};
 	foreach $key (keys %$hashref) {
 	    if($key =~ /Priesthood/i &&
-	       ($membership_data{$index}{$key} =~ /^Teacher\s*$/i ||
+	       ($membership_data{$index}{$key} =~ /^Deacon\s*$/i ||
+	        $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'};
@@ -127,17 +128,19 @@ sub update_eq_aaronic_table
 }
 
 # EQ_ELDER
-#+------------+------------------+------+-----+---------+-------+
-#| Field      | Type             | Null | Key | Default | Extra |
-#+------------+------------------+------+-----+---------+-------+
-#| elder      | int(16) unsigned |      | PRI | 0       |   A   |
-#| name       | varchar(60)      | YES  |     | NULL    |       |
-#| phone      | varchar(12)      | YES  |     | NULL    |       |
-#| valid      | tinyint(1)       | YES  |     | NULL    |       |
-#+------------+------------------+------+-----+---------+-------+
+#+-------------+------------------+------+-----+---------+----------------+
+#| Field       | Type             | Null | Key | Default | Extra          |
+#+-------------+------------------+------+-----+---------+----------------+
+#| elder       | int(16) unsigned |      | PRI | NULL    | auto_increment |
+#| name        | varchar(60)      | YES  |     | NULL    |                |
+#| phone       | varchar(12)      | YES  |     | NULL    |                |
+#| ppi_pri     | int(10) unsigned | YES  |     | 1       |                |
+#| ppi_notes   | varchar(128)     | YES  |     | NULL    |                |
+#| valid       | tinyint(1)       | YES  |     | NULL    |                |
+#+-------------+------------------+------+-----+---------+----------------+
 sub update_eq_elder_table
 {
-    print "-> Updating eq_elder table\n";
+    print "\n-> Updating eq_elder 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_elder set valid=0");
@@ -160,7 +163,7 @@ 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','$phone',1)");
+		    $sth = $dbh->prepare("insert into eq_elder values (NULL,'$elder_name','$phone','1','',1)");
 		    $sth->execute or die "-E- DB error: $DBI::errstr\n";
 		} elsif($rows == 1) {
 		    # An existing record was found for this elder, update it
@@ -196,7 +199,7 @@ sub update_eq_elder_table
 #+--------------+------------------+------+-----+---------+-------+
 sub update_eq_calling_table()
 {
-    print "-> Updating eq_calling table\n";
+    print "\n-> Updating eq_calling table\n";
 
     #print "-> Organization Data Dump\n\n";
     #&print_hash(\%organization_data);
@@ -236,7 +239,7 @@ sub update_eq_district_table
 {
     # Districts should be created by hand. This subroutine only
     # updates the supervisor's ID in each district.
-    print "-> Updating eq_district table\n";
+    print "\n-> Updating eq_district table\n";
     $sth = $dbh->prepare("select * from eq_district");
     $sth->execute or die "-E- DB error: $DBI::errstr\n";
     while($sqlhashref = $sth->fetchrow_hashref) {
@@ -266,7 +269,7 @@ sub update_eq_district_table
 #+---------------+------------------+------+-----+---------+-------+
 sub update_eq_companionship_table
 {
-    print "-> Updating eq_companionship table\n";
+    print "\n-> Updating eq_companionship table\n";
 
     # First, mark all existing companionships as invalid in case they have been dissolved
     $sth = $dbh->prepare("update eq_companionship set valid=0");
@@ -349,11 +352,13 @@ sub update_eq_companionship_table
 #| name          | varchar(30)      | YES  |     | NULL    |       |
 #| name_id       | varchar(30)      | YES  |     | NULL    |       |
 #| companionship | int(16) unsigned | YES  |     | NULL    |       |
+#| visit_pri     | int(10) unsigned | YES  |     | 1       |       |
+#| visit_notes   | varchar(128)     | YES  |     | NULL    |       |
 #| valid         | tinyint(1)       | YES  |     | NULL    |       |
 #+---------------+------------------+------+-----+---------+-------+
 sub update_eq_family_table
 {
-    print "-> Updating eq_family table\n";
+    print "\n-> Updating eq_family 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_family set valid=0");
@@ -381,7 +386,7 @@ 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','$name_id','0',1)");
+		    $sth = $dbh->prepare("insert into eq_family values (NULL,$id,'$family_name','$name_id','0',1,1,'')");
 		    $sth->execute or die "-E- DB error: $DBI::errstr\n";
 		} elsif($rows == 1) {
 		    # An existing record was found for this family, update it
@@ -400,8 +405,11 @@ sub update_eq_family_table
 		    $hashref = $hometeaching_data{$index};
 		    foreach $key (keys %$hashref) {
 			if($hometeaching_data{$index}{'Household'} =~ /(\S+)\s+(\S+),\s+(\S+)\s+(.*)/) {
-			    print "I: Adjusting hometeaching match from: $hometeaching_data{$index}{'Household'} to $1, $3 $4\n";
-			    $hometeaching_data{$index}{'Household'} = "$1, $3 $4";
+			    $a = $1; $b = $2; $c = $3; $d = $4;
+			    if($family_name =~ /$a/ && $hometeaching_data{$index}{'Household'} !~ /$family_name/i) { 
+				print "I: Adjusting hometeaching match from: $hometeaching_data{$index}{'Household'} to $a, $c $d\n";
+				$hometeaching_data{$index}{'Household'} = "$a, $c $d";
+			    }
 			}
 			if($key =~ /Quorum/i &&
 			   $hometeaching_data{$index}{$key} =~ /Elders/i &&
@@ -437,7 +445,7 @@ sub update_eq_family_table
 #+----------+------------------+------+-----+---------+-------+
 sub update_eq_parent_table
 {
-    print "-> Updating eq_parent table\n";
+    print "\n-> Updating eq_parent 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_parent set valid=0");
@@ -467,11 +475,14 @@ sub update_eq_parent_table
 		}
 
 		# Find the family id for this parent's HofH_ID.
-		$sth = $dbh->prepare("select * from eq_family where hofh_id='$hofh_id'");
+		$sth = $dbh->prepare("select * from eq_family where hofh_id='$hofh_id' and valid=1");
 		$sth->execute or die "-E- DB error: $DBI::errstr\n";
-		$sqlhashref = $sth->fetchrow_hashref();
-		$family_id = $sqlhashref->{'family'};
-
+		my @family_data = ();
+		while($sqlhashref = $sth->fetchrow_hashref) { push(@family_data, $sqlhashref); }
+		my $family_rows = scalar @family_data;
+		if($family_rows > 0) { $family_id = $family_data[0]->{'family'}; }
+		else { $family_id = 0; }
+		
 		# Find out how many parents match this parent's name
 		$sth = $dbh->prepare("select * from eq_parent where name='$parent_name'");
 		$sth->execute or die "-E- DB error: $DBI::errstr\n";
@@ -479,12 +490,12 @@ sub update_eq_parent_table
 		while($sqlhashref = $sth->fetchrow_hashref) { push(@data, $sqlhashref); }
 		my $rows = scalar @data;
 		
-		if($rows == 0) {
+		if($rows == 0 && $family_rows > 0) {
 		    # No existing records found for this parent, make a new entry
 		    print "   Adding new Parent: $parent_name\n";
 		    $sth = $dbh->prepare("insert into eq_parent values (NULL,$family_id,'$parent_name','$year-$month-$day','$phone','$address','$id',1)");
 		    $sth->execute or die "-E- DB error: $DBI::errstr\n";
-		} elsif($rows == 1) {
+		} elsif($rows == 1 && $family_rows > 0) {
 		    # An existing record was found for this parent, update it
 		    print "   Updating existing parent: $parent_name\n";
 		    $sth = $dbh->prepare("update eq_parent set family='$family_id' where name='$parent_name'");
@@ -522,7 +533,7 @@ sub update_eq_parent_table
 #+----------+------------------+------+-----+---------+-------+
 sub update_eq_child_table
 {
-    print "-> Updating eq_child table\n";
+    print "\n-> Updating eq_child 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_child set valid=0");
@@ -541,11 +552,14 @@ sub update_eq_child_table
 		$hofh_id = $membership_data{$index}{'HofH ID'};
 
 		# Find the family id for this child's HofH_ID.
-		$sth = $dbh->prepare("select * from eq_family where hofh_id='$hofh_id'");
+		$sth = $dbh->prepare("select * from eq_family where hofh_id='$hofh_id' and valid=1");
 		$sth->execute or die "-E- DB error: $DBI::errstr\n";
-		$sqlhashref = $sth->fetchrow_hashref();
-		$family_id = $sqlhashref->{'family'};
-
+		my @family_data = ();
+		while($sqlhashref = $sth->fetchrow_hashref) { push(@family_data, $sqlhashref); }
+		my $family_rows = scalar @family_data;
+		if($family_rows > 0) { $family_id = $family_data[0]->{'family'}; }
+		else { $family_id = 0; }
+		
 		# Find out how many children have the same name for the same family
 		$sth = $dbh->prepare("select * from eq_child where name='$child_name'");
 		$sth->execute or die "-E- DB error: $DBI::errstr\n";
@@ -553,12 +567,12 @@ sub update_eq_child_table
 		while($sqlhashref = $sth->fetchrow_hashref) { push(@data, $sqlhashref); }
 		my $rows = scalar @data;
 		
-		if($rows == 0) {
+		if($rows == 0 && $family_rows > 0) {
 		    # No existing records found for this child, make a new entry
 		    print "   Adding new Child: $child_name\n";
 		    $sth = $dbh->prepare("insert into eq_child values (NULL,$family_id,'$child_name','$year-$month-$day','$id',1)");
 		    $sth->execute or die "-E- DB error: $DBI::errstr\n";
-		} elsif($rows == 1) {
+		} elsif($rows == 1 && $family_rows > 0) {
 		    # An existing record was found for this child, update it
 		    print "   Updating existing child: $child_name\n";
 		    $sth = $dbh->prepare("update eq_child set family='$family_id' where name='$child_name'");
@@ -652,7 +666,7 @@ if(defined $opt_o) {
 # Process command line options
 if(defined $opt_n) { $datadir = $opt_n; }
 else { $datadir = shift(@ARGV); }
-print "-> Processing all ward data files in $datadir\n";
+print "\n-> Processing all ward data files in $datadir\n";
 
 ###################################################
 # Parse Ward Data Files