===================================================================
RCS file: /cvs/pta/pta_import.pl,v
retrieving revision 1.15
retrieving revision 1.23
diff -u -p -r1.15 -r1.23
--- pta/pta_import.pl	2020/11/18 23:44:46	1.15
+++ pta/pta_import.pl	2020/11/26 19:39:43	1.23
@@ -1,4 +1,4 @@
-#!/usr/bin/perl 
+#!/usr/bin/perl
 
 # Copyright (c) 2020 Freda Bundchen
 
@@ -22,8 +22,10 @@ use Getopt::Std qw(getopts);
 our ($opt_I);
 
 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,
@@ -31,12 +33,25 @@ my %banks = (
 
 # === SUBROUTINES  =====================================================
 
+sub import_bbva_usa ($$$) {
+	my ($account, $csv_account, $line) = @_;
+	$line =~
+	    m#(\d+)/(\d+)/(\d+),(.*?),\S+,(\(?\d+\.\d+\)?),# or
+	    die "parse error: $line";
+	my ($month, $day, $year, $description, $amount) =
+	    ($1, $2, $3, $4, $5);
+	$amount =~ s/\((\d+\.\d+)\)/-$1/;
+	return "$year$month$day",
+	    get_accounts_by_amount_sign($amount, $account, $csv_account),
+	    $description;
+}
+
 sub import_chase_credit ($$$) {
 	my ($account, $csv_account, $line) = @_;
 	my ($trans_date, $post_date, $description, $category,
 	    $type, $amount) = split /,/, $line;
 	my ($debit, $credit);
-	$post_date =~ s#(\d+)/(\d+)/(\d+)#$3$1$2#; 
+	$post_date =~ s#(\d+)/(\d+)/(\d+)#$3$1$2#;
 	($amount, $debit, $credit) =
 	    get_accounts_by_amount_sign($amount, $account,
 	    $csv_account);
@@ -48,13 +63,27 @@ sub import_capital_one_credit ($$$) {
 	my ($trans_date, $post_date, $card_num,
 	    $description, $category, $csv_debit,
 	    $csv_credit) = split /,/, $line;
-	$post_date =~ s/(\d+)-(\d+)-(\d+)/$1$2$3/; 
-	my ($amount, $debit, $credit) = 
+	$post_date =~ s/(\d+)-(\d+)-(\d+)/$1$2$3/;
+	my ($amount, $debit, $credit) =
 	    get_accounts_by_csv_col($account, $csv_account,
 	    $csv_debit, $csv_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,
@@ -86,7 +115,7 @@ sub import_sparkasse_camt ($$$) {
 sub import_wellsfargo ($$$) {
 	my ($account, $csv_account, $line) = @_;
 	$line =~
-	    m#^"(\d+)/(\d+)/(\d+)","(-?\d+\.\d+)","\*","","(.*?)"$# or
+	    m#^"(\d+)/(\d+)/(\d+)","(-?\d+\.\d+)","\*",".*","(.*?)"$# or
 	    die "parse error: $line" ;
 	my ($month, $day, $year, $amount, $description) =
 	    ($1, $2, $3, $4, $5);
@@ -100,10 +129,10 @@ sub get_accounts_by_amount_sign ($$$) {
 	my ($debit, $credit);
 	if ($amount <= 0) {
 		$amount = substr $amount, 1;
-		$credit = $csv_account;	
+		$credit = $csv_account;
 		$debit = $account;
 	} else {
-		$debit = $csv_account;	
+		$debit = $csv_account;
 		$credit = $account;
 	}
 	return ($amount, $debit, $credit);
@@ -140,9 +169,9 @@ my $account_name = $opt_I;
 $banks{$account_name} or die "unknown accountname: $account_name";
 
 # Parse the configuration file.
-my $fn = "import_" . $account_name . ".txt";
+my $fn = "import/" . $account_name . ".txt";
 open my $in, '<', $fn or die "$fn: $!";
-my ($csv_account, $delim, $header, @compiled);
+my ($csv_account, $delim, $header, $quote, @compiled, @ignored);
 while (<$in>) {
 	chomp;
 	next if /^(?:#|$)/;
@@ -162,6 +191,15 @@ while (<$in>) {
 		$header = $1;
 		next;
 	}
+	if (/^QUOTE\s+(\S)$/) {
+		$quote and die "duplicate QUOTE line: $1";
+		$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";
@@ -175,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 (<STDIN>) {
 	chomp;
 	next if (/^$/);
+	foreach my $ignore (@ignored) {
+		next LINE if /$ignore/;
+	}
 	my $line = $_;
 	if ($header) {
 		$line eq $header
@@ -185,7 +229,13 @@ while (<>) {
 		undef $header;
 		next;
 	}
-	my @fields = split /$delim/, $line;
+	my $copy_line = $line;
+	my @fields;
+	if ($quote) {
+		push @fields, $1 while $copy_line =~ s/$quote([^$quote]*)$quote$delim?//;
+	} else {
+		@fields = split /$delim/, $line;
+	}
 	my $matches = 0;
 	my ($account, $booking);
 	foreach my $selector (@compiled) {