===================================================================
RCS file: /cvs/pta/pta_import.pl,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- pta/pta_import.pl	2020/11/27 16:17:08	1.24
+++ pta/pta_import.pl	2020/11/29 14:00:50	1.25
@@ -33,108 +33,6 @@ my %banks = (
 );
 
 # === SUBROUTINES  =====================================================
-
-sub import_bbva_usa ($$$) {
-	my ($account, $csv_account, $line) = @_;
-	$line =~
-	    m#(\d+)/(\d+)/(\d+),(.*?),\S+,(\(?\d+\.\d+\)?),# or
-	    die "parse error: $line";
-	my ($month, $day, $year, $description, $amount) =
-	    ($1, $2, $3, $4, $5);
-	$amount =~ s/\((\d+\.\d+)\)/-$1/;
-	return "$year$month$day",
-	    get_accounts_by_amount_sign($amount, $account, $csv_account),
-	    $description;
-}
-
-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_360 ($$$) {
-	my ($account, $csv_account, $line) = @_;
-	my @fields = split /,/, $line;
-	$fields[1] =~ s#(\d+)/(\d+)/(\d+)#20$3$1$2#;
-	my ($amount, $debit, $credit) =
-	    get_accounts_by_amount_sign($fields[2], $account,
-	    $csv_account);
-	return ($fields[1], $amount, $debit, $credit, $fields[4]);
-}
-
-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_etrade_ira ($$$) {
-	my ($account, $csv_account, $line) = @_;
-	my @fields = split /,/, $line;
-	$fields[0] =~ s#(\d+)/(\d+)/(\d+)#20$3$1$2#;
-	my ($amount, $debit, $credit) =
-	    get_accounts_by_amount_sign($fields[5], $account,
-	    $csv_account);
-	if ($fields[2] eq 'EQ') {
-		$fields[8] .= " [$fields[3]]"; 
-	}
-	return ($fields[0], $amount, $debit, $credit, 
-	    join ' quantity ', $fields[8], $fields[4]);
-}
-
-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 import_wellsfargo ($$$) {
-	my ($account, $csv_account, $line) = @_;
-	$line =~
-	    m#^"(\d+)/(\d+)/(\d+)","(-?\d+\.\d+)","\*",".*","(.*?)"$# or
-	    die "parse error: $line" ;
-	my ($month, $day, $year, $amount, $description) =
-	    ($1, $2, $3, $4, $5);
-	return "$year$month$day",
-	    get_accounts_by_amount_sign($amount, $account, $csv_account),
-	    $description;
-}
-
 sub get_accounts_by_amount_sign ($$$) {
 	my ($amount, $account, $csv_account) = @_;
 	my ($debit, $credit);
@@ -182,7 +80,9 @@ $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, $quote, @compiled, @ignored);
+my ($cost_center_field, $csv_account, $date_field, $date_format,
+    $delim, $header, $quantity_field, $quote, @amount_fields,
+    @compiled, @description_fields, @ignored);
 while (<$in>) {
 	chomp;
 	next if /^(?:#|$)/;
@@ -192,25 +92,48 @@ while (<$in>) {
 		$csv_account = $1;
 		next;
 	}
+	if (s/^AMOUNT\s+//) {
+		push @amount_fields, $1 - 1 while s/(\d+)\s*//;
+		$_ eq '' or die "trailing garbage: AMOUNT ... $_";
+		next;
+	}
+	if (/^COSTCENTER\s+(\d+)/) {
+		$cost_center_field = $1 - 1;
+		next;
+	}
+	if (/^DATE\s+(\d+)\s+(\S+)/) {
+		$date_field = $1 - 1;
+		$date_format = $2;
+		next;
+	}
 	if (/^DELIM\s+(\S)$/) {
 		$delim and die "duplicate DELIM line: $1";
 		$delim = $1;
 		next;
 	}
+	if (s/^DESCRIPTION\s+//) {
+	    push @description_fields, $1 - 1 while s/(\d+)\s*//;
+	    $_ eq '' or die "trailing garbage: DESCRIPTION ... $_";
+	    next;
+	}
 	if (/^HEADER\s+(.*)$/) {
 		$header and die "duplicate HEADER line: $1";
 		$header = $1;
 		next;
 	}
+	if (/^IGNORE\s+(.*)/) {
+		push @ignored, qr/$1/;
+		next;
+	}
+	if (/^QUANTITY\s+(\d+)/) {
+		$quantity_field = $1 - 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";
@@ -263,10 +186,45 @@ LINE: while (<STDIN>) {
 		}
 	}
 	$matches or die "unmatched CSV line: $line";
-	my ($date, $amount, $debit, $credit, $description) =
-	    $banks{$account_name}->($account, $csv_account, $line);
+	my $date = $fields[$date_field] or
+	    die "date parse error: $line";
+	if ($date_format eq "MM/DD/YYYY") {
+		$date =~ s#(\d+)/(\d+)/(\d+)#$3$1$2#;
+	} elsif ($date_format eq "MM/DD/YY") {
+		$date =~ s#(\d+)/(\d+)/(\d+)#20$3$1$2#;
+	} elsif ($date_format eq "YYYY-MM-DD") {
+		$date =~ s#(\d+)-(\d+)-(\d+)#$1$2$3#;
+	} elsif ($date_format eq "DD.MM.YY") {
+		$date =~ s#(\d+)\.(\d+)\.(\d+)#20$3$2$1#;
+	} else {
+		die "unhandled date format: $line";
+	}
+	foreach my $i (@amount_fields) {
+		if (defined($fields[$i])) {
+			$fields[$i] =~ s/,/./;
+			$fields[$i] =~ s/\$//;
+			$fields[$i] = "-$1" if $fields[$i] =~ /^\((\d+\.\d+)\)/;
+		}
+	}
+	my $description = join ' ', @fields[@description_fields];
+	my ($amount, $credit, $debit);
+	if ($#amount_fields) {
+		($amount, $debit, $credit) =
+		    get_accounts_by_csv_col($account,
+		    $csv_account, $fields[$amount_fields[0]],
+		    $fields[$amount_fields[1]]);
+	} else {
+		($amount, $debit, $credit) =
+		    get_accounts_by_amount_sign(
+		        $fields[$amount_fields[0]],
+		        $account, $csv_account);
+	}
 	$date && $amount && $debit && $credit && $description
 	    or die "import parse error: $line";
 	$description =~ s/#//g;
+	$description .= " [$fields[$cost_center_field]]"
+	    if $cost_center_field;
+	$description .= " quantity $fields[$quantity_field]"
+	    if $quantity_field;
 	print "$date $booking $debit $credit $amount $description\n";
 }