X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=blobdiff_plain;f=bin%2Fimport_ward_data;h=97b3fa1729d13af91c520293abffd4ef8faac48f;hb=cdf97a969659bdd67bf33e61b5ccf7ae042938fd;hp=57a7f51ae7dcc9fd5bbca49a35b6425a8c5149b8;hpb=dac99ce35c9d3b885f7cc2584493812923303b3d;p=eq%2F.git

diff --git a/bin/import_ward_data b/bin/import_ward_data
index 57a7f51..97b3fa1 100755
--- a/bin/import_ward_data
+++ b/bin/import_ward_data
@@ -109,7 +109,7 @@ sub print_hash
 #| Field       | Type             | Null | Key | Default | Extra          |
 #+-------------+------------------+------+-----+---------+----------------+
 #| indiv       | int(16) unsigned |      | PRI | NULL    | auto_increment |
-#| indiv_id    | int(16) unsigned |      |     | NULL    |                |
+#| mls_indiv_id| int(16) unsigned |      |     | NULL    |                |
 #| name        | varchar(60)      | YES  |     | NULL    |                |
 #| phone       | varchar(12)      | YES  |     | NULL    |                |
 #| email       | varchar(120)     | YES  |     | NULL    |                |
@@ -121,12 +121,12 @@ sub print_hash
 #| attending   | tinyint(1)       | YES  |     | 0       |                |
 #| valid       | tinyint(1)       | YES  |     | NULL    |                |
 #+-------------+------------------+------+-----+---------+----------------+
-sub update_tc_indiv_table
+sub update_tc_individual_table
 {
-	print "\n-> Updating tc_indiv table\n";
+	print "\n-> Updating tc_individual table\n";
 
 	# Set all records to be invalid. Only mark them as valid if they appear on the new list.
-	$sth = $dbh->prepare("update tc_indiv set valid=0");
+	$sth = $dbh->prepare("update tc_individual set valid=0");
 	$sth->execute or die "-E- DB error: $DBI::errstr\n";
 
 	foreach $index (keys %membership_data)
@@ -152,7 +152,7 @@ sub update_tc_indiv_table
 		if($phone =~ /^\(\d\d\d\) (\d\d\d-\d\d\d\d)/) { $phone = "$1-$2"; }
 		$email = $membership_data{$index}{'indiv E-mail'};
 		if ($email eq "") { $email = $membership_data{$index}{'Household E-mail'}; }
-		$sth = $dbh->prepare("select * from tc_indiv where name=\"$indiv_name\"");
+		$sth = $dbh->prepare("select * from tc_individual where name=\"$indiv_name\"");
 		$sth->execute or die "-E- DB error: $DBI::errstr\n";
 		my @data = ();
 		while($sqlhashref = $sth->fetchrow_hashref) { push(@data, $sqlhashref); }
@@ -160,34 +160,34 @@ sub update_tc_indiv_table
 		if($rows == 0) {
 			# No existing records found for this indiv, make a new entry
 			print "   Adding new indiv: $indiv_name\n";
-			$sth = $dbh->prepare("insert into tc_indiv values (NULL,'$id',\"$indiv_name\",'$address','$phone','$email','','$hhposition','$priesthood','','$default_interview_pri','','$default_interview_pri','',$attending,1)");
+			$sth = $dbh->prepare("insert into tc_individual values (NULL,'$id',\"$indiv_name\",'$address','$phone','$email','','$hhposition','$priesthood','','$default_interview_pri','','$default_interview_pri','',$attending,1)");
 			$sth->execute or die "-E- DB error: $DBI::errstr\n";
 		} elsif($rows == 1) {
 			# An existing record was found for this indiv, update it
 			print "   Updating existing indiv: $indiv_name\n";
-			$sth = $dbh->prepare("update tc_indiv set valid=1 where name=\"$indiv_name\"");
+			$sth = $dbh->prepare("update tc_individual set valid=1 where name=\"$indiv_name\"");
 			$sth->execute or die "-E- DB error: $DBI::errstr\n";
 			if($phone ne "") { 
-				$sth = $dbh->prepare("update tc_indiv set phone='$phone' where name=\"$indiv_name\"");
+				$sth = $dbh->prepare("update tc_individual set phone='$phone' where name=\"$indiv_name\"");
 			} else {
-				$sth = $dbh->prepare("update tc_indiv set phone=NULL where name=\"$indiv_name\"");
+				$sth = $dbh->prepare("update tc_individual set phone=NULL where name=\"$indiv_name\"");
 			}
 			$sth->execute or die "-E- DB error: $DBI::errstr\n";
 			if($address ne "") { 
-				$sth = $dbh->prepare("update tc_indiv set address='$address' where name=\"$indiv_name\"");
+				$sth = $dbh->prepare("update tc_individual set address='$address' where name=\"$indiv_name\"");
 			} else {
-				$sth = $dbh->prepare("update tc_indiv set address=NULL where name=\"$indiv_name\"");
+				$sth = $dbh->prepare("update tc_individual set address=NULL where name=\"$indiv_name\"");
 			}
 			$sth->execute or die "-E- DB error: $DBI::errstr\n";
-			$sth = $dbh->prepare("update tc_indiv set attending='$attending' where name=\"$indiv_name\"");
+			$sth = $dbh->prepare("update tc_individual set attending='$attending' where name=\"$indiv_name\"");
 			$sth->execute or die "-E- DB error: $DBI::errstr\n";
-			$sth = $dbh->prepare("update tc_indiv set indiv_id='$id' where name=\"$indiv_name\"");
+			$sth = $dbh->prepare("update tc_individual set mls_indiv_id='$id' where name=\"$indiv_name\"");
 			$sth->execute or die "-E- DB error: $DBI::errstr\n";
-			$sth = $dbh->prepare("update tc_indiv set priesthood='$priesthood' where name=\"$indiv_name\"");
+			$sth = $dbh->prepare("update tc_individual set priesthood='$priesthood' where name=\"$indiv_name\"");
 			$sth->execute or die "-E- DB error: $DBI::errstr\n";
-			$sth = $dbh->prepare("update tc_indiv set email='$email' where name=\"$indiv_name\"");
+			$sth = $dbh->prepare("update tc_individual set email='$email' where name=\"$indiv_name\"");
 			$sth->execute or die "-E- DB error: $DBI::errstr\n";
-			$sth = $dbh->prepare("update tc_indiv set hh_position='$hhposition' where name=\"$indiv_name\"");
+			$sth = $dbh->prepare("update tc_individual set hh_position='$hhposition' where name=\"$indiv_name\"");
 			$sth->execute or die "-E- DB error: $DBI::errstr\n";
 		} else {
 			# More than one record was found. Error! This shouldn't happen.
@@ -258,7 +258,7 @@ sub update_tc_district_table
     while($sqlhashref = $sth->fetchrow_hashref) {
 	$supervisor_name = $sqlhashref->{name};
 	$district = $sqlhashref->{district};
-	$sth2 = $dbh->prepare("select * from tc_indiv where name='$supervisor_name'");
+	$sth2 = $dbh->prepare("select * from tc_individual where name='$supervisor_name'");
 	$sth2->execute or die "-E- DB error: $DBI::errstr\n";
 	$sqlhashref2 = $sth2->fetchrow_hashref;
 	$supervisor_id = $sqlhashref2->{indiv};
@@ -295,7 +295,7 @@ sub update_tc_companionship_table
 				foreach $field ("Home Teacher 1","Home Teacher 2") {
 					$indiv_name = $hometeaching_data{$index}{$field};
 					if($indiv_name eq "") { next; }
-					$sth2 = $dbh->prepare("select * from tc_indiv where name='$indiv_name'");
+					$sth2 = $dbh->prepare("select * from tc_individual where name='$indiv_name'");
 					$sth2->execute or die "-E- DB error: $DBI::errstr\n";
 					$sqlhashref2 = $sth2->fetchrow_hashref;
 					$indiv = $sqlhashref2->{indiv};
@@ -339,7 +339,7 @@ sub update_tc_companionship_table
 #| hofh_id       | int(16) unsigned | YES  |     | NULL    |       |
 #| name          | varchar(30)      | YES  |     | NULL    |       |
 #| name_id       | varchar(30)      | YES  |     | NULL    |       |
-#| indiv_id      | int(16) unsigned | YES  |     | NULL    |       |
+#| individual    | int(16) unsigned | YES  |     | NULL    |       |
 #| companionship | int(16) unsigned | YES  |     | NULL    |       |
 #| visit_pri     | int(10) unsigned | YES  |     | 1       |       |
 #| visit_notes   | varchar(128)     | YES  |     | NULL    |       |
@@ -389,13 +389,13 @@ sub update_tc_family_table
 					print "   -E- More than one record found ($rows) for family name: $family_name\n";
 				}
 
-				# Now update the indiv_id field for this family
-				$sth = $dbh->prepare("select * from tc_indiv WHERE name='$family_name'");
+				# Now update the individual field for this family
+				$sth = $dbh->prepare("select * from tc_individual WHERE name='$family_name'");
 				$sth->execute or die "-E- DB error: $DBI::errstr\n";
 				while($sqlhashref = $sth->fetchrow_hashref) {
-					$indiv_id = $sqlhashref->{indiv};
-					print "   Updating family indiv_id: $family_name -> $indiv_id\n";
-					$sth = $dbh->prepare("update tc_family set indiv_id=$indiv_id where name_id='$name_id'");
+					$individual = $sqlhashref->{indiv};
+					print "   Updating family individual: $family_name -> $individual\n";
+					$sth = $dbh->prepare("update tc_family set individual=$individual where name_id='$name_id'");
 					$sth->execute or die "-E- DB error: $DBI::errstr\n";
 				}
 
@@ -546,7 +546,7 @@ sub check_for_changed_ids
 
 	foreach $oldindex (keys %$oldhashref)
 	{
-		$indiv_id = $oldhashref->{$oldindex}{'Indiv ID'};
+		$mls_indiv_id = $oldhashref->{$oldindex}{'Indiv ID'};
 		$hofh_id  = $oldhashref->{$oldindex}{'HofH ID'};
 		$full_name = $oldhashref->{$oldindex}{'Full Name'};
 		$hh_position = $oldhashref->{$oldindex}{'HH Position'};
@@ -555,9 +555,9 @@ sub check_for_changed_ids
 		foreach $newindex (keys %$newhashref)
 		{
 			if($newhashref->{$newindex}{'Full Name'} eq $full_name &&
-			   $indiv_id != $newhashref->{$newindex}{'Indiv ID'})
+			   $mls_indiv_id != $newhashref->{$newindex}{'Indiv ID'})
 			{
-				print "-W- Indiv ID for $full_name changed from $indiv_id to $newhashref->{$newindex}{'Indiv ID'}\n";
+				print "-W- Indiv ID for $full_name changed from $mls_indiv_id to $newhashref->{$newindex}{'Indiv ID'}\n";
 				$found_problem = 1;
 			}
 
@@ -573,9 +573,9 @@ sub check_for_changed_ids
 	return $found_problem;
 }
 
-sub update_family_in_tc_indiv_table
+sub update_family_in_tc_individual_table
 {
-	print "\n-> Updating family info in tc_indiv table\n";
+	print "\n-> Updating family info in tc_individual table\n";
 
 	foreach $index (keys %membership_data)
 	{
@@ -596,8 +596,8 @@ sub update_family_in_tc_indiv_table
 
 			print "   Updating family data for: $name\n";
 
-			# write the family id to the individual's data in tc_indiv
-			$sth = $dbh->prepare("update tc_indiv set family='$family_id' where name=\"$name\""); 
+			# write the family id to the individual's data in tc_individual
+			$sth = $dbh->prepare("update tc_individual set family='$family_id' where name=\"$name\""); 
 			$sth->execute or die "-E- DB error: $DBI::errstr\n";
 		} else {
 			$family_id = 0; 
@@ -607,7 +607,7 @@ sub update_family_in_tc_indiv_table
 
 sub update_organization_class_data
 {
-	print "\n-> Updating organization class info in tc_indiv table\n";
+	print "\n-> Updating organization class info in tc_individual table\n";
 
 	foreach $index (keys %organization_class_data)
 	{
@@ -617,12 +617,12 @@ sub update_organization_class_data
 
 		if ($org_class =~ m/Elder/i) {
 			#print "   $name:  Elder\n";
-			$sth = $dbh->prepare("update tc_indiv set steward='Elder' where name=\"$name\"");
+			$sth = $dbh->prepare("update tc_individual set steward='Elder' where name=\"$name\"");
 			$sth->execute or die "-E- DB error: $DBI::errstr\n";
 		}
 		if ($org_class =~ m/High Priest/i) {
 			#print "   $name:  High Priest\n";
-			$sth = $dbh->prepare("update tc_indiv set steward='High Priest' where name=\"$name\"");
+			$sth = $dbh->prepare("update tc_individual set steward='High Priest' where name=\"$name\"");
 			$sth->execute or die "-E- DB error: $DBI::errstr\n";
 		}
 	}
@@ -692,12 +692,12 @@ if($opt_s) { $dbh->disconnect(); exit; }
 
 # Now update the various eq DB tables
 &update_tc_calling_table();
-&update_tc_indiv_table();
+&update_tc_individual_table();
 &update_tc_district_table();
 &update_tc_companionship_table();
 &update_tc_family_table();
 &update_tc_visit_table();
-&update_family_in_tc_indiv_table();
+&update_family_in_tc_individual_table();
 &update_organization_class_data();
 
 print "\n-> Import Successful! DONE...\n";