===================================================================
RCS file: /cvs/pta/pta_import.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- pta/pta_import.pl	2020/11/03 09:14:03	1.4
+++ pta/pta_import.pl	2020/11/10 17:15:08	1.5
@@ -19,16 +19,28 @@ use strict;
 
 # === SUBROUTINES  =====================================================
 
-sub import_chase_credit_card {
-	my $csv_account = "1234";	# DEBUG. hard-coded for now
-	my $fn = 'import_chase_credit.txt';
-	my (@compiled, %bookings, %accounts);
+sub parse_import_file {
+	my $fn = $_[0];
+	my (@compiled, %bookings, %accounts, $import_type);
+	my $csv_account = "";
+	if ($fn eq "import_chase_credit.txt") {
+		$import_type = "chase_credit";
+	} elsif ($fn eq "import_capital_one_credit.txt") { 
+		$import_type = "capital_one_credit";
+	} else {
+		die "Undefined import type for: $fn";
+	}
 	open my $in, $fn or die "$fn: $!";
 	while (<$in>) {
 		chomp;
 		next if /^(?:#|$)/;
 		my $line = $_;
-		s/^(.*),\s+(\d+)\s+(\S+)// or 
+		if (/^ACCOUNT/) {
+			$csv_account = $line;
+			$csv_account =~ s/^ACCOUNT\s+(\d+)$/$1/;
+			next;
+		}
+		s/^(.*),\s+(\d+)\s+(\S+)// or
 		    die "$fn import parse error: $line";
 		my ($reg, $account, $booking) = ($1, $2, $3);
 		$reg =~ s/(?:^|(?<=,))(?:$|(?=,))/[^,]*/g;
@@ -38,25 +50,36 @@ sub import_chase_credit_card {
 		$accounts{$reg} = $account;
 	}
 	close $in;
+	die "CSV account not defined in $fn" if ($csv_account eq "");
+	return (\%bookings, \%accounts, \@compiled, $csv_account, $import_type);
+}
+
+sub import_chase_credit_card {
+	my ($bookings_ref, $accounts_ref, $compiled_ref,
+	    $csv_account) = @_;
+	my ($trans_date, $post_date, $description, $category, 
+	    $type, $amount);
+	chomp(my $header = <>);
 	while (<>) {
+		next if (/^$/);
 		chomp;
 		s#(\d+)/(\d+)/(\d+)#$3$1$2#g; 
 		my $line = $_;
-		my ($trans_date, $post_date, $description, $category, 
+		($trans_date, $post_date, $description, $category, 
 		    $type, $amount) = split /,/;
 		$description =~ s/#//g;
 		my ($debit, $credit);
 		my $booking = "";
 		my $account = "";
-		foreach my $regex (@compiled) {
+		foreach my $regex (@$compiled_ref) {
 			if ($line =~ /$regex/) {
-				$account = $accounts{$regex};
-				$booking = $bookings{$regex};
+				$account = %$accounts_ref{$regex};
+				$booking = %$bookings_ref{$regex};
 				last;
 			}
 		}
 		if ($booking eq "" || $account eq "") {
-			die "$fn import parse error: $line";
+			die "import parse error: $line";
 		}
 		if ($amount <= 0) {
 			$amount = substr $amount, 1;
@@ -71,14 +94,61 @@ sub import_chase_credit_card {
 	}
 }
 
+sub import_capital_one_credit_card {
+	my ($bookings_ref, $accounts_ref, $compiled_ref,
+	    $csv_account) = @_;
+	my ($trans_date, $post_date, $card_num, $description,
+	    $category, $csv_debit, $csv_credit, $amount);
+	chomp(my $header = <>);
+	while (<>) {
+		next if (/^$/);
+		chomp;
+		s/(\d+)-(\d+)-(\d+)/$1$2$3/g; 
+		my $line = $_;
+		($trans_date, $post_date, $card_num, $description,
+		    $category, , $csv_debit, $csv_credit) = split /,/;
+		$description =~ s/#//g;
+		my ($debit, $credit);
+		my $booking = "";
+		my $account = "";
+		foreach my $regex (@$compiled_ref) {
+			if ($line =~ /$regex/) {
+				$account = %$accounts_ref{$regex};
+				$booking = %$bookings_ref{$regex};
+				last;
+			}
+		}
+		if ($booking eq "" || $account eq "") {
+			die "import parse error: $line";
+		}
+		if ($csv_debit =~ /^$/) {
+			$amount = $csv_credit;
+			$credit = $account;
+			$debit = $csv_account;
+		} else {
+			$amount = $csv_debit;
+			$credit = $csv_account;
+			$debit = $account;
+		}
+		print "$post_date $booking $debit $credit $amount " .
+		    "$description\n";
+	}
+}
 # === MAIN PROGRAM =====================================================
 
-my ($chase_credit_card_header, $firstLine);
-$chase_credit_card_header = "Transaction Date,Post Date," .
-    "Description,Category,Type,Amount";
-chomp($firstLine = <>);
-if ($firstLine eq $chase_credit_card_header) {
-	import_chase_credit_card;
+# This begins the user-editable section to select the formatting file. 
+my $fn = "import_capital_one_credit.txt";	
+# my $fn = "import_chase_credit.txt";	
+# This ends the user-editable section to select the formatting file. 
+
+my ($bookings_ref, $accounts_ref, $compiled_ref, $csv_account, $import_type) =
+    parse_import_file($fn);
+if ($import_type eq "chase_credit") {
+	import_chase_credit_card($bookings_ref, $accounts_ref,
+	    $compiled_ref, $csv_account);
+} elsif ($import_type eq "capital_one_credit") {
+	import_capital_one_credit_card($bookings_ref, $accounts_ref,
+	$compiled_ref, $csv_account);
 } else {
-	die "Undefined header: $firstLine";
+	die "Undefined import type: $import_type";
 }