===================================================================
RCS file: /cvs/pta/pta_import.pl,v
retrieving revision 1.10
retrieving revision 1.13
diff -u -p -r1.10 -r1.13
--- pta/pta_import.pl	2020/11/12 21:54:23	1.10
+++ pta/pta_import.pl	2020/11/18 21:32:16	1.13
@@ -21,53 +21,15 @@ 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 import_account ($$$$$) {
-	my ($account_name, $accounts_ref, $bookings_ref,
-	    $compiled_ref, $csv_account) = @_;
-	my ($account, $amount, $booking, $credit, $date, $debit,
-	    $description);
-	chomp(my $header = <>);
-	while (<>) {
-		next if (/^$/);
-		chomp;
-		my $line = $_;
-		foreach my $regex (@$compiled_ref) {
-			if ($line =~ /$regex/) {
-				$account = %$accounts_ref{$regex};
-				$booking = %$bookings_ref{$regex};
-				last;
-			}
-		}
-		if ($account_name eq "chase_credit") {
-			($date, $amount, $debit, $credit,
-			    $description) =
-			    import_chase_credit($account,
-			    $csv_account, $line);
-		} elsif ($account_name eq "capital_one_credit") {
-			($date, $amount, $debit, $credit,
-			    $description) =
-			    import_capital_one_credit($account,
-			    $csv_account, $line);
-		} elsif ($account_name eq "optum_hsa") {
-			($date, $amount, $debit, $credit,
-			    $description) =
-			    import_optum_hsa($account,
-			    $csv_account, $line);
-		} else {
-			die "undefined format: $account_name";
-		}
-		unless ($date && $booking && $debit && $credit &&
-		    $amount && $description) {
-			die "import parse error: $line";
-		}
-		$description =~ s/#//g;
-		print "$date $booking $debit $credit $amount " .
-		    "$description\n";
-	}
-}
-
 sub import_chase_credit ($$$) {
 	my ($account, $csv_account, $line) = @_;
 	my ($trans_date, $post_date, $description, $category,
@@ -105,6 +67,21 @@ sub import_optum_hsa ($$$) {
 	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);
@@ -141,34 +118,73 @@ sub usage () {
 
 # === MAIN PROGRAM =====================================================
 
-my ($csv_account, $fn, $in, $account_name, %accounts, %bookings, @compiled);
+my ($csv_account, $fn, $in, $account_name, $delim, @compiled);
+
+# 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 {
 	usage;
 }
+
+# Parse the configuration file.
 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;
+	}
+	$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";
-import_account($account_name, \%accounts, \%bookings,
-    \@compiled, $csv_account);
+
+# 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";
+}