Skip to content

Commit

Permalink
Remove duplicate "and and" in some biographies
Browse files Browse the repository at this point in the history
  • Loading branch information
nigelhorne committed Jan 30, 2020
1 parent cc610fa commit 8c1448a
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
7 changes: 7 additions & 0 deletions changes.psv
Expand Up @@ -275,3 +275,10 @@ date|xref|change
20200127|"I2887"|"Changed date of marriage from 1932/04/30 to 1965/01/10"
20200127|"I2889"|"Added date of marriage as 1897/10/16"
20200127|"I3016"|"Changed date of marriage from 1947 to 1953/10/10"
20200130|"I1660"|"Added new person"
20200130|"I1660"|"Added new person"
20200130|"I1660"|"Added new person"
20200130|"I1660"|"Added new person"
20200130|"I1660"|"Added new person"
20200130|"I1660"|"Added new person"
20200130|"I1660"|"Added new person"
11 changes: 6 additions & 5 deletions ged2site
Expand Up @@ -59,7 +59,6 @@ BEGIN {
'Sort::Key::DateTime', 'Text::Names::GB',
'Class::Simple::Cached', 'Class::Simple::Readonly::Cached',
'HTML::GoogleMaps::V3 0.13',
'HTTP::Cache::Transparent',
'Term::ANSIColor',
'URI::Find::Schemeless',
'XML::Dumper', 'XML::Twig', 'Locale::US', 'CHI', 'Class::Simple',
Expand Down Expand Up @@ -129,7 +128,6 @@ use autodie qw(:all);
# }

# use Lingua::EN::AddressParse;
use HTTP::Cache::Transparent;
use File::Basename;
use File::Spec;
use File::Temp;
Expand Down Expand Up @@ -170,9 +168,12 @@ if($opts{'m'} || $opts{'w'}) {
if($opts{'w'}) {
push @modules,
'Geo::Coder::Postcodes',
'LWP::UserAgent::Cached', 'HTTP::Cache::Transparent', 'Genealogy::ChroniclingAmerica', 'Locale::Country';
'LWP::UserAgent::Cached', 'Genealogy::ChroniclingAmerica', 'Locale::Country';
}
}
if($opts{'d'} || $opts{'m'}) {
push @modules, 'HTTP::Cache::Transparent';
}

my @needfull;
foreach my $module(@modules) {
Expand Down Expand Up @@ -729,7 +730,7 @@ HEADER

# TODO: Add a -p option to do something like this - it's useful in debugging
# foreach my $person($ged->get_individual('Dolly Cowell')) {
# foreach my $person($ged->get_individual('Sophia Chapple')) {
# foreach my $person($ged->get_individual('Ruth Marie Bixler')) {

foreach my $person(@everyone) {
$index++;
Expand Down Expand Up @@ -2645,7 +2646,7 @@ sub print_person
}

if(scalar(@spouses) && ($numberofchildren > 0) && !$all_children_are_alive) {
$bio .= ' and';
# $bio .= ' and';
} else {
$bio .= '.';
$end_of_sentence = 1;
Expand Down

0 comments on commit 8c1448a

Please sign in to comment.