===================================================================
RCS file: /cvs/pta/pta_import.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- pta/pta_import.pl	2020/11/17 15:31:02	1.12
+++ pta/pta_import.pl	2020/11/18 21:32:16	1.13
@@ -21,66 +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, $compiled_ref, $delim, $csv_account) = @_;
-	my ($account, $amount, $booking, $credit, $date, $debit,
-	    $description);
-	chomp(my $header = <>);
-	while (<>) {
-		next if (/^$/);
-		chomp;
-		my $line = $_;
-		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) =
-			    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);
-		} elsif ($account_name eq "sparkasse_camt") {
-			($date, $amount, $debit, $credit,
-			    $description) =
-			    import_sparkasse_camt($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,
@@ -170,14 +119,19 @@ sub usage () {
 # === MAIN PROGRAM =====================================================
 
 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 /^(?:#|$)/;
@@ -203,4 +157,34 @@ while (<$in>) {
 }
 close $in;
 $csv_account or die "no ACCOUNT line in $fn";
-import_account($account_name, \@compiled, $delim, $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";
+}