===================================================================
RCS file: /cvs/pta/pta_import.pl,v
retrieving revision 1.16
retrieving revision 1.20
diff -u -p -r1.16 -r1.20
--- pta/pta_import.pl	2020/11/19 19:56:48	1.16
+++ pta/pta_import.pl	2020/11/23 14:14:23	1.20
@@ -1,4 +1,4 @@
-#!/usr/bin/perl 
+#!/usr/bin/perl
 
 # Copyright (c) 2020 Freda Bundchen
 
@@ -34,7 +34,7 @@ my %banks = (
 
 sub import_bbva_usa ($$$) {
 	my ($account, $csv_account, $line) = @_;
-	$line =~ 
+	$line =~
 	    m#(\d+)/(\d+)/(\d+),(.*?),\S+,(\(?\d+\.\d+\)?),# or
 	    die "parse error: $line";
 	my ($month, $day, $year, $description, $amount) =
@@ -50,7 +50,7 @@ sub import_chase_credit ($$$) {
 	my ($trans_date, $post_date, $description, $category,
 	    $type, $amount) = split /,/, $line;
 	my ($debit, $credit);
-	$post_date =~ s#(\d+)/(\d+)/(\d+)#$3$1$2#; 
+	$post_date =~ s#(\d+)/(\d+)/(\d+)#$3$1$2#;
 	($amount, $debit, $credit) =
 	    get_accounts_by_amount_sign($amount, $account,
 	    $csv_account);
@@ -62,8 +62,8 @@ sub import_capital_one_credit ($$$) {
 	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) = 
+	$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);
@@ -100,7 +100,7 @@ sub import_sparkasse_camt ($$$) {
 sub import_wellsfargo ($$$) {
 	my ($account, $csv_account, $line) = @_;
 	$line =~
-	    m#^"(\d+)/(\d+)/(\d+)","(-?\d+\.\d+)","\*","","(.*?)"$# or
+	    m#^"(\d+)/(\d+)/(\d+)","(-?\d+\.\d+)","\*",".*","(.*?)"$# or
 	    die "parse error: $line" ;
 	my ($month, $day, $year, $amount, $description) =
 	    ($1, $2, $3, $4, $5);
@@ -114,10 +114,10 @@ sub get_accounts_by_amount_sign ($$$) {
 	my ($debit, $credit);
 	if ($amount <= 0) {
 		$amount = substr $amount, 1;
-		$credit = $csv_account;	
+		$credit = $csv_account;
 		$debit = $account;
 	} else {
-		$debit = $csv_account;	
+		$debit = $csv_account;
 		$credit = $account;
 	}
 	return ($amount, $debit, $credit);
@@ -156,7 +156,7 @@ $banks{$account_name} or die "unknown accountname: $ac
 # Parse the configuration file.
 my $fn = "import_" . $account_name . ".txt";
 open my $in, '<', $fn or die "$fn: $!";
-my ($csv_account, $delim, $header, @compiled);
+my ($csv_account, $delim, $header, $quote, @compiled, @ignored);
 while (<$in>) {
 	chomp;
 	next if /^(?:#|$)/;
@@ -176,6 +176,15 @@ while (<$in>) {
 		$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";
@@ -189,9 +198,12 @@ close $in;
 $csv_account or die "no ACCOUNT line in $fn";
 
 # Parse the CSV file from the bank.
-while (<>) {
+LINE: while (<>) {
 	chomp;
 	next if (/^$/);
+	foreach my $ignore (@ignored) {
+		next LINE if /$ignore/;
+	}
 	my $line = $_;
 	if ($header) {
 		$line eq $header
@@ -199,7 +211,13 @@ while (<>) {
 		undef $header;
 		next;
 	}
-	my @fields = split /$delim/, $line;
+	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) {