===================================================================
RCS file: /cvs/pta/pta_import.pl,v
retrieving revision 1.6
retrieving revision 1.13
diff -u -p -r1.6 -r1.13
--- pta/pta_import.pl	2020/11/10 17:25:58	1.6
+++ pta/pta_import.pl	2020/11/18 21:32:16	1.13
@@ -17,138 +17,174 @@
 use warnings;
 use strict;
 
+use Getopt::Std qw(getopts);
+
+our ($opt_I);
+
+my %banks = (
+    "capital_one_credit"    => \&import_capital_one_credit,
+    "chase_credit"          => \&import_chase_credit,
+    "optum_hsa"             => \&import_optum_hsa,
+    "sparkasse_camt"        => \&import_sparkasse_camt,
+);
+
 # === SUBROUTINES  =====================================================
 
-sub parse_import_file ($) {
-	my $fn = shift;
-	my (@compiled, %bookings, %accounts, $import_type);
-	my $csv_account = "";
-	if ($fn eq "import_chase_credit.txt") {
-		$import_type = "chase_credit";
-	} elsif ($fn eq "import_capital_one_credit.txt") { 
-		$import_type = "capital_one_credit";
+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_optum_hsa ($$$) {
+        my ($account, $csv_account, $line) = @_;
+        my ($date, $description, $amount,
+            $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 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 {
-		die "Undefined import type for: $fn";
+		$debit = $csv_account;	
+		$credit = $account;
 	}
-	open my $in, $fn or die "$fn: $!";
-	while (<$in>) {
-		chomp;
-		next if /^(?:#|$)/;
-		my $line = $_;
-		if (/^ACCOUNT/) {
-			$csv_account = $line;
-			$csv_account =~ s/^ACCOUNT\s+(\d+)$/$1/;
-			next;
-		}
-		s/^(.*),\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;
-	}
-	close $in;
-	die "CSV account not defined in $fn" if ($csv_account eq "");
-	return (\%bookings, \%accounts, \@compiled, $csv_account, $import_type);
+	return ($amount, $debit, $credit);
 }
 
-sub import_chase_credit_card ($$$$) {
-	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 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 import_capital_one_credit_card ($$$$) {
-	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 usage () {
+	printf STDERR "usage: %s -I accountname csvfilename\n", $0;
+	exit 1;
 }
+
 # === MAIN PROGRAM =====================================================
 
-# This begins the user-editable section to select the formatting file. 
-my $fn = "import_capital_one_credit.txt";	
-# my $fn = "import_chase_credit.txt";	
-# This ends the user-editable section to select the formatting file. 
+my ($csv_account, $fn, $in, $account_name, $delim, @compiled);
 
-my ($bookings_ref, $accounts_ref, $compiled_ref, $csv_account, $import_type) =
-    parse_import_file $fn;
-if ($import_type eq "chase_credit") {
-	import_chase_credit_card $bookings_ref, $accounts_ref,
-	    $compiled_ref, $csv_account;
-} elsif ($import_type eq "capital_one_credit") {
-	import_capital_one_credit_card $bookings_ref, $accounts_ref,
-	$compiled_ref, $csv_account;
+# Parse command line arguments.
+getopts 'I:' or usage;
+if ($opt_I) {
+	$account_name = $opt_I;
+	$banks{$account_name} or die "unknown accountname: $account_name";
+	$fn = "import_" . $account_name . ".txt";
+	open $in, $fn or die "$fn: $!";
 } else {
-	die "Undefined import type: $import_type";
+	usage;
+}
+
+# Parse the configuration file.
+while (<$in>) {
+	chomp;
+	next if /^(?:#|$)/;
+	my $line = $_;
+	if (/^ACCOUNT\s+(\S+)$/) {
+		$csv_account and die "duplicate ACCOUNT line: $1";
+		$csv_account = $1;
+		next;
+	}
+	if (/^DELIM\s+(\S)$/) {
+		$delim and die "duplicate DELIM line: $1";
+		$delim = $1;
+		next;
+	}
+	$delim or die "no DELIM line in $fn";
+	s/^(.*)$delim\s+(\d+)\s+(\S+)// or
+	    die "$fn import parse error: $line";
+	push @compiled, {
+		re => [map { qr/$_/ } split /$delim/, $1],
+		ac => $2,
+		id => $3,
+	};
+}
+close $in;
+$csv_account or die "no ACCOUNT line in $fn";
+
+# Parse the CSV file from the bank.
+chomp(my $header = <>);
+while (<>) {
+	chomp;
+	next if (/^$/);
+	my $line = $_;
+	my @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";
 }