===================================================================
RCS file: /cvs/pta/pta_import.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- pta/pta_import.pl	2020/11/17 14:13:31	1.11
+++ pta/pta_import.pl	2020/11/17 15:31:02	1.12
@@ -23,9 +23,8 @@ our ($opt_I);
 
 # === SUBROUTINES  =====================================================
 
-sub import_account ($$$$$) {
-	my ($account_name, $accounts_ref, $bookings_ref,
-	    $compiled_ref, $csv_account) = @_;
+sub import_account ($$$$) {
+	my ($account_name, $compiled_ref, $delim, $csv_account) = @_;
 	my ($account, $amount, $booking, $credit, $date, $debit,
 	    $description);
 	chomp(my $header = <>);
@@ -33,13 +32,22 @@ sub import_account ($$$$$) {
 		next if (/^$/);
 		chomp;
 		my $line = $_;
-		foreach my $regex (@$compiled_ref) {
-			if ($line =~ /$regex/) {
-				$account = %$accounts_ref{$regex};
-				$booking = %$bookings_ref{$regex};
+		my @fields = split /$delim/, $line;
+		my $matches = 0;
+		foreach my $selector (@$compiled_ref) {
+			$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";
 		if ($account_name eq "chase_credit") {
 			($date, $amount, $debit, $credit,
 			    $description) =
@@ -161,7 +169,7 @@ sub usage () {
 
 # === MAIN PROGRAM =====================================================
 
-my ($csv_account, $fn, $in, $account_name, %accounts, %bookings, @compiled);
+my ($csv_account, $fn, $in, $account_name, $delim, @compiled);
 getopts 'I:' or usage;
 if ($opt_I) {
 	$account_name = $opt_I;
@@ -174,25 +182,25 @@ 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+(\d+)\s+(\S+)$/ or
-	    die "$fn import parse error: $line";
-	my ($reg, $account, $booking) = ($1, $2, $3);
-	if ($account_name eq 'sparkasse_camt') {
-		$reg =~ s/(?:^|(?<=;))(?:$|(?=;))/"[^"]*"/g;
-	} else {
-		$reg =~ s/(?:^|(?<=,))(?:$|(?=,))/[^,]*/g;
+	if (/^DELIM\s+(\S)$/) {
+		$delim and die "duplicate DELIM line: $1";
+		$delim = $1;
+		next;
 	}
-	$reg = qr/$reg/;
-	push @compiled, $reg;
-	$bookings{$reg} = $booking;
-	$accounts{$reg} = $account;
+	$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";
-import_account($account_name, \%accounts, \%bookings,
-    \@compiled, $csv_account);
+import_account($account_name, \@compiled, $delim, $csv_account);