=================================================================== RCS file: /cvs/pta/pta_import.pl,v retrieving revision 1.19 retrieving revision 1.22 diff -u -p -r1.19 -r1.22 --- pta/pta_import.pl 2020/11/22 01:48:36 1.19 +++ pta/pta_import.pl 2020/11/26 18:04:43 1.22 @@ -25,6 +25,7 @@ my %banks = ( "bbva_usa" => \&import_bbva_usa, "capital_one_credit" => \&import_capital_one_credit, "chase_credit" => \&import_chase_credit, + "etrade_ira" => \&import_etrade_ira, "optum_hsa" => \&import_optum_hsa, "sparkasse_camt" => \&import_sparkasse_camt, "wellsfargo" => \&import_wellsfargo, @@ -69,6 +70,20 @@ sub import_capital_one_credit ($$$) { return ($post_date, $amount, $debit, $credit, $description); } +sub import_etrade_ira ($$$) { + my ($account, $csv_account, $line) = @_; + my @fields = split /,/, $line; + $fields[0] =~ s#(\d+)/(\d+)/(\d+)#20$3$1$2#; + my ($amount, $debit, $credit) = + get_accounts_by_amount_sign($fields[5], $account, + $csv_account); + if ($fields[2] eq 'EQ') { + $fields[8] .= " [$fields[3]]"; + } + return ($fields[0], $amount, $debit, $credit, + join ' quantity ', $fields[8], $fields[4]); +} + sub import_optum_hsa ($$$) { my ($account, $csv_account, $line) = @_; my ($date, $description, $amount, @@ -156,7 +171,7 @@ $banks{$account_name} or die "unknown accountname: $ac # Parse the configuration file. my $fn = "import_" . $account_name . ".txt"; open my $in, '<', $fn or die "$fn: $!"; -my ($csv_account, $delim, $header, $quote, @compiled); +my ($csv_account, $delim, $header, $quote, @compiled, @ignored); while (<$in>) { chomp; next if /^(?:#|$)/; @@ -181,6 +196,10 @@ while (<$in>) { $quote = $1; next; } + if (/^IGNORE\s+(.*)/) { + push @ignored, qr/$1/; + next; + } $delim or die "no DELIM line in $fn"; s/^(.*)$delim\s+(\d+)\s+(\S+)// or die "$fn import parse error: $line"; @@ -194,9 +213,15 @@ close $in; $csv_account or die "no ACCOUNT line in $fn"; # Parse the CSV file from the bank. -while (<>) { +if (@ARGV) { + open STDIN, '<', $ARGV[0] or die "$ARGV[0]: $!"; +} +LINE: while () { chomp; next if (/^$/); + foreach my $ignore (@ignored) { + next LINE if /$ignore/; + } my $line = $_; if ($header) { $line eq $header