===================================================================
RCS file: /cvs/pta/pta_import.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- pta/pta_import.pl	2020/11/12 13:08:13	1.9
+++ pta/pta_import.pl	2020/11/12 21:54:23	1.10
@@ -23,23 +23,16 @@ our ($opt_I);
 
 # === SUBROUTINES  =====================================================
 
-sub import_chase_credit ($$$$) {
-	my ($bookings_ref, $accounts_ref, $compiled_ref,
-	    $csv_account) = @_;
-	my ($trans_date, $post_date, $description, $category, 
-	    $type, $amount);
+sub import_account ($$$$$) {
+	my ($account_name, $accounts_ref, $bookings_ref,
+	    $compiled_ref, $csv_account) = @_;
+	my ($account, $amount, $booking, $credit, $date, $debit,
+	    $description);
 	chomp(my $header = <>);
 	while (<>) {
 		next if (/^$/);
 		chomp;
-		s#(\d+)/(\d+)/(\d+)#$3$1$2#g; 
 		my $line = $_;
-		($trans_date, $post_date, $description, $category, 
-		    $type, $amount) = split /,/;
-		$description =~ s/#//g;
-		my ($debit, $credit);
-		my $booking = "";
-		my $account = "";
 		foreach my $regex (@$compiled_ref) {
 			if ($line =~ /$regex/) {
 				$account = %$accounts_ref{$regex};
@@ -47,116 +40,112 @@ sub import_chase_credit ($$$$) {
 				last;
 			}
 		}
-		if ($booking eq "" || $account eq "") {
-			die "import parse error: $line";
-		}
-		if ($amount <= 0) {
-			$amount = substr $amount, 1;
-			$credit = $csv_account;	
-			$debit = $account;
+		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);
 		} else {
-			$debit = $csv_account;	
-			$credit = $account;
+			die "undefined format: $account_name";
 		}
-		print "$post_date $booking $debit $credit $amount " .
-		    "$description\n";
-	}
-}
-
-sub import_capital_one_credit ($$$$) {
-	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 "") {
+		unless ($date && $booking && $debit && $credit &&
+		    $amount && $description) {
 			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 =~ s/#//g;
+		print "$date $booking $debit $credit $amount " .
 		    "$description\n";
 	}
 }
 
-sub import_optum_hsa {
-        my ($bookings_ref, $accounts_ref, $compiled_ref,
-            $csv_account) = @_;
+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_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_optum_hsa ($$$) {
+        my ($account, $csv_account, $line) = @_;
         my ($date, $description, $amount,
-            $type);
-        chomp(my $header = <>);
-        while (<>) {
-                next if (/^$/);
-                chomp;
-                s#(\d+)-(\d+)-(\d+)#$1$2$3#;
-                my $line = $_;
-                ($date, $description, $amount,
-                    $type) = split /,/;
-                $description =~ s/#//g;
-                $amount =~ s/\$//;
-                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 ($amount <= 0) {
-                        $amount = substr $amount, 1;
-                        $credit = $csv_account;
-                        $debit = $account;
-                } else {
-                        $debit = $csv_account;
-                        $credit = $account;
-                }
-                print "$date $booking $debit $credit $amount " .
-                    "$description\n";
-        }
+            $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 get_accounts_by_amount_sign ($$$) {
+	my ($amount, $account, $csv_account) = @_;
+	my ($debit, $credit);
+	if ($amount <= 0) {
+		$amount = substr $amount, 1;
+		$credit = $csv_account;	
+		$debit = $account;
+	} else {
+		$debit = $csv_account;	
+		$credit = $account;
+	}
+	return ($amount, $debit, $credit);
+}
+
+sub get_accounts_by_csv_col ($$$$) {
+	my ($account, $csv_account, $csv_debit, $csv_credit) = @_;
+	my ($amount, $debit, $credit);
+	if ($csv_debit eq "") {
+		$amount = $csv_credit;
+		$credit = $account;
+		$debit = $csv_account;
+	} else {
+		$amount = $csv_debit;
+		$credit = $csv_account;
+		$debit = $account;
+	}
+	return ($amount, $debit, $credit);
+}
+
 sub usage () {
-	printf STDERR "usage: %s -I bankname csvfilename\n", $0;
+	printf STDERR "usage: %s -I accountname csvfilename\n", $0;
 	exit 1;
 }
 
 # === MAIN PROGRAM =====================================================
 
-my ($csv_account, $fn, $in, $sub_name, %accounts, %bookings, @compiled);
+my ($csv_account, $fn, $in, $account_name, %accounts, %bookings, @compiled);
 getopts 'I:' or usage;
 if ($opt_I) {
-	$sub_name = "import_" . $opt_I;
-	$fn = $sub_name . ".txt";
+	$account_name = $opt_I;
+	$fn = "import_" . $account_name . ".txt";
 	open $in, $fn or die "$fn: $!";
 } else {
 	usage;
@@ -181,5 +170,5 @@ while (<$in>) {
 }
 close $in;
 $csv_account or die "no ACCOUNT line in $fn";
-my $sub_ref = \&$sub_name;
-&$sub_ref(\%bookings, \%accounts, \@compiled, $csv_account);
+import_account($account_name, \%accounts, \%bookings,
+    \@compiled, $csv_account);