=================================================================== RCS file: /cvs/pta/pta_import.pl,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- pta/pta_import.pl 2020/11/12 21:54:23 1.10 +++ pta/pta_import.pl 2020/11/17 14:13:31 1.11 @@ -55,6 +55,11 @@ sub import_account ($$$$$) { $description) = import_optum_hsa($account, $csv_account, $line); + } elsif ($account_name eq "sparkasse_camt") { + ($date, $amount, $debit, $credit, + $description) = + import_sparkasse_camt($account, + $csv_account, $line); } else { die "undefined format: $account_name"; } @@ -105,6 +110,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); @@ -159,10 +179,14 @@ while (<$in>) { $csv_account = $1; next; } - s/^(.*),\s+(\d+)\s+(\S+)// or + /^(.*)[,;]\s+(\d+)\s+(\S+)$/ or die "$fn import parse error: $line"; my ($reg, $account, $booking) = ($1, $2, $3); - $reg =~ s/(?:^|(?<=,))(?:$|(?=,))/[^,]*/g; + if ($account_name eq 'sparkasse_camt') { + $reg =~ s/(?:^|(?<=;))(?:$|(?=;))/"[^"]*"/g; + } else { + $reg =~ s/(?:^|(?<=,))(?:$|(?=,))/[^,]*/g; + } $reg = qr/$reg/; push @compiled, $reg; $bookings{$reg} = $booking;