=================================================================== RCS file: /cvs/pta/pta_import.pl,v retrieving revision 1.6 retrieving revision 1.8 diff -u -p -r1.6 -r1.8 --- pta/pta_import.pl 2020/11/10 17:25:58 1.6 +++ pta/pta_import.pl 2020/11/10 17:42:32 1.8 @@ -22,7 +22,7 @@ use strict; sub parse_import_file ($) { my $fn = shift; my (@compiled, %bookings, %accounts, $import_type); - my $csv_account = ""; + my $csv_account; if ($fn eq "import_chase_credit.txt") { $import_type = "chase_credit"; } elsif ($fn eq "import_capital_one_credit.txt") { @@ -35,9 +35,9 @@ sub parse_import_file ($) { chomp; next if /^(?:#|$)/; my $line = $_; - if (/^ACCOUNT/) { - $csv_account = $line; - $csv_account =~ s/^ACCOUNT\s+(\d+)$/$1/; + if (/^ACCOUNT\s+(\d+)$/) { + $csv_account and die "duplicate ACCOUNT line: $1"; + $csv_account = $1; next; } s/^(.*),\s+(\d+)\s+(\S+)// or @@ -50,7 +50,7 @@ sub parse_import_file ($) { $accounts{$reg} = $account; } close $in; - die "CSV account not defined in $fn" if ($csv_account eq ""); + $csv_account or die "no ACCOUNT line in $fn"; return (\%bookings, \%accounts, \@compiled, $csv_account, $import_type); }