===================================================================
RCS file: /cvs/pta/pta_import.pl,v
retrieving revision 1.9
retrieving revision 1.22
diff -u -p -r1.9 -r1.22
--- pta/pta_import.pl	2020/11/12 13:08:13	1.9
+++ pta/pta_import.pl	2020/11/26 18:04:43	1.22
@@ -1,4 +1,4 @@
-#!/usr/bin/perl 
+#!/usr/bin/perl
 
 # Copyright (c) 2020 Freda Bundchen
 
@@ -21,165 +21,241 @@ 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,
+);
+
 # === SUBROUTINES  =====================================================
 
-sub import_chase_credit ($$$$) {
-	my ($bookings_ref, $accounts_ref, $compiled_ref,
-	    $csv_account) = @_;
-	my ($trans_date, $post_date, $description, $category, 
-	    $type, $amount);
-	chomp(my $header = <>);
-	while (<>) {
-		next if (/^$/);
-		chomp;
-		s#(\d+)/(\d+)/(\d+)#$3$1$2#g; 
-		my $line = $_;
-		($trans_date, $post_date, $description, $category, 
-		    $type, $amount) = split /,/;
-		$description =~ s/#//g;
-		my ($debit, $credit);
-		my $booking = "";
-		my $account = "";
-		foreach my $regex (@$compiled_ref) {
-			if ($line =~ /$regex/) {
-				$account = %$accounts_ref{$regex};
-				$booking = %$bookings_ref{$regex};
-				last;
-			}
-		}
-		if ($booking eq "" || $account eq "") {
-			die "import parse error: $line";
-		}
-		if ($amount <= 0) {
-			$amount = substr $amount, 1;
-			$credit = $csv_account;	
-			$debit = $account;
-		} else {
-			$debit = $csv_account;	
-			$credit = $account;
-		}
-		print "$post_date $booking $debit $credit $amount " .
-		    "$description\n";
-	}
+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_capital_one_credit ($$$$) {
-	my ($bookings_ref, $accounts_ref, $compiled_ref,
-	    $csv_account) = @_;
-	my ($trans_date, $post_date, $card_num, $description,
-	    $category, $csv_debit, $csv_credit, $amount);
-	chomp(my $header = <>);
-	while (<>) {
-		next if (/^$/);
-		chomp;
-		s/(\d+)-(\d+)-(\d+)/$1$2$3/g; 
-		my $line = $_;
-		($trans_date, $post_date, $card_num, $description,
-		    $category, , $csv_debit, $csv_credit) = split /,/;
-		$description =~ s/#//g;
-		my ($debit, $credit);
-		my $booking = "";
-		my $account = "";
-		foreach my $regex (@$compiled_ref) {
-			if ($line =~ /$regex/) {
-				$account = %$accounts_ref{$regex};
-				$booking = %$bookings_ref{$regex};
-				last;
-			}
-		}
-		if ($booking eq "" || $account eq "") {
-			die "import parse error: $line";
-		}
-		if ($csv_debit =~ /^$/) {
-			$amount = $csv_credit;
-			$credit = $account;
-			$debit = $csv_account;
-		} else {
-			$amount = $csv_debit;
-			$credit = $csv_account;
-			$debit = $account;
-		}
-		print "$post_date $booking $debit $credit $amount " .
-		    "$description\n";
+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#;
+	($amount, $debit, $credit) =
+	    get_accounts_by_amount_sign($amount, $account,
+	    $csv_account);
+	return ($post_date, $amount, $debit, $credit, $description);
+}
+
+sub import_capital_one_credit ($$$) {
+	my ($account, $csv_account, $line) = @_;
+	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) =
+	    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 ($bookings_ref, $accounts_ref, $compiled_ref,
-            $csv_account) = @_;
+sub import_optum_hsa ($$$) {
+        my ($account, $csv_account, $line) = @_;
         my ($date, $description, $amount,
-            $type);
-        chomp(my $header = <>);
-        while (<>) {
-                next if (/^$/);
-                chomp;
-                s#(\d+)-(\d+)-(\d+)#$1$2$3#;
-                my $line = $_;
-                ($date, $description, $amount,
-                    $type) = split /,/;
-                $description =~ s/#//g;
-                $amount =~ s/\$//;
-                my ($debit, $credit);
-                my $booking = "";
-                my $account = "";
-                foreach my $regex (@$compiled_ref) {
-                        if ($line =~ /$regex/) {
-                                $account = %$accounts_ref{$regex};
-                                $booking = %$bookings_ref{$regex};
-                                last;
-                        }
-                }
-                if ($booking eq "" || $account eq "") {
-                        die "import parse error: $line";
-                }
-                if ($amount <= 0) {
-                        $amount = substr $amount, 1;
-                        $credit = $csv_account;
-                        $debit = $account;
-                } else {
-                        $debit = $csv_account;
-                        $credit = $account;
-                }
-                print "$date $booking $debit $credit $amount " .
-                    "$description\n";
-        }
+            $type) = split /,/, $line;
+	my ($debit, $credit);
+	$date =~ s/(\d+)-(\d+)-(\d+)/$1$2$3/;
+	$amount =~ s/\$//;
+	($amount, $debit, $credit) =
+	    get_accounts_by_amount_sign($amount, $account,
+	    $csv_account);
+	return ($date, $amount, $debit, $credit, $description);
 }
 
+sub import_sparkasse_camt ($$$) {
+        my ($account, $csv_account, $line) = @_;
+	my @fields;
+	$_ = $line;
+	push @fields, $1 while s/"([^"]*)";?//;
+	$_ eq "" or die "CAMT parse error before $_ in $line";
+	@fields == 17 or die "not 17 but @fields fields: $line";
+	$fields[1] =~ s/^(\d\d)\.(\d\d)\.(\d\d)$/20$3$2$1/
+	    or die "date parse error: $line";
+	$fields[14] =~ s/,/./;
+	return $fields[1],
+	    get_accounts_by_amount_sign($fields[14], $account, $csv_account),
+	    (join ' ', $fields[11], $fields[4]);
+}
+
+sub import_wellsfargo ($$$) {
+	my ($account, $csv_account, $line) = @_;
+	$line =~
+	    m#^"(\d+)/(\d+)/(\d+)","(-?\d+\.\d+)","\*",".*","(.*?)"$# or
+	    die "parse error: $line" ;
+	my ($month, $day, $year, $amount, $description) =
+	    ($1, $2, $3, $4, $5);
+	return "$year$month$day",
+	    get_accounts_by_amount_sign($amount, $account, $csv_account),
+	    $description;
+}
+
+sub get_accounts_by_amount_sign ($$$) {
+	my ($amount, $account, $csv_account) = @_;
+	my ($debit, $credit);
+	if ($amount <= 0) {
+		$amount = substr $amount, 1;
+		$credit = $csv_account;
+		$debit = $account;
+	} else {
+		$debit = $csv_account;
+		$credit = $account;
+	}
+	return ($amount, $debit, $credit);
+}
+
+sub get_accounts_by_csv_col ($$$$) {
+	my ($account, $csv_account, $csv_debit, $csv_credit) = @_;
+	my ($amount, $debit, $credit);
+	if ($csv_debit eq "") {
+		$amount = $csv_credit;
+		$credit = $account;
+		$debit = $csv_account;
+	} else {
+		$amount = $csv_debit;
+		$credit = $csv_account;
+		$debit = $account;
+	}
+	return ($amount, $debit, $credit);
+}
+
 sub usage () {
-	printf STDERR "usage: %s -I bankname csvfilename\n", $0;
+	printf STDERR "usage: %s -I accountname csvfilename\n", $0;
 	exit 1;
 }
 
 # === MAIN PROGRAM =====================================================
 
-my ($csv_account, $fn, $in, $sub_name, %accounts, %bookings, @compiled);
 getopts 'I:' or usage;
-if ($opt_I) {
-	$sub_name = "import_" . $opt_I;
-	$fn = $sub_name . ".txt";
-	open $in, $fn or die "$fn: $!";
-} else {
+unless ($opt_I) {
+	warn "The option -I is required.";
 	usage;
 }
+my $account_name = $opt_I;
+$banks{$account_name} or die "unknown accountname: $account_name";
+
+# Parse the configuration file.
+my $fn = "import_" . $account_name . ".txt";
+open my $in, '<', $fn or die "$fn: $!";
+my ($csv_account, $delim, $header, $quote, @compiled, @ignored);
 while (<$in>) {
 	chomp;
 	next if /^(?:#|$)/;
 	my $line = $_;
-	if (/^ACCOUNT\s+(\d+)$/) {
+	if (/^ACCOUNT\s+(\S+)$/) {
 		$csv_account and die "duplicate ACCOUNT line: $1";
 		$csv_account = $1;
 		next;
 	}
-	s/^(.*),\s+(\d+)\s+(\S+)// or
+	if (/^DELIM\s+(\S)$/) {
+		$delim and die "duplicate DELIM line: $1";
+		$delim = $1;
+		next;
+	}
+	if (/^HEADER\s+(.*)$/) {
+		$header and die "duplicate HEADER line: $1";
+		$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";
-	my ($reg, $account, $booking) = ($1, $2, $3);
-	$reg =~ s/(?:^|(?<=,))(?:$|(?=,))/[^,]*/g;
-	$reg = qr/$reg/;
-	push @compiled, $reg;
-	$bookings{$reg} = $booking;
-	$accounts{$reg} = $account;
+	push @compiled, {
+		re => [map { qr/$_/ } split /$delim/, $1],
+		ac => $2,
+		id => $3,
+	};
 }
 close $in;
 $csv_account or die "no ACCOUNT line in $fn";
-my $sub_ref = \&$sub_name;
-&$sub_ref(\%bookings, \%accounts, \@compiled, $csv_account);
+
+# Parse the CSV file from the bank.
+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
+		    or die "expected HEADER $header\nbut got $line";
+		undef $header;
+		next;
+	}
+	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) {
+		$matches = 1;
+		for (my $i = 0; $i <= $#{$selector->{re}}; $i++) {
+			next if $fields[$i] =~ $selector->{re}[$i];
+			$matches = 0;
+			last;
+		}
+		if ($matches) {
+			$account = $selector->{ac};
+			$booking = $selector->{id};
+			last;
+		}
+	}
+	$matches or die "unmatched CSV line: $line";
+	my ($date, $amount, $debit, $credit, $description) =
+	    $banks{$account_name}->($account, $csv_account, $line);
+	$date && $amount && $debit && $credit && $description
+	    or die "import parse error: $line";
+	$description =~ s/#//g;
+	print "$date $booking $debit $credit $amount $description\n";
+}