proper match arguments help

diff --git a/FS/FS/cust_tax_location.pm b/FS/FS/cust_tax_location.pm
index bb61089..16a79db 100644 (file)
--- a/FS/FS/cust_tax_location.pm
+++ b/FS/FS/cust_tax_location.pm
@@ -211,7 +211,7 @@ sub batch_import {
 
   } elsif ( $format eq 'cch-zip' || $format eq 'cch-update-zip' ) {
     @fields = qw( zip city county state postalcity countyfips countydef default geocode cityflag unique );
-    push @fields, 'actionflag' if $format eq 'cch-update';
+    push @fields, 'actionflag' if $format eq 'cch-update-zip';
 
     $imported++ if $format eq 'cch-update'; #empty file ok
     

diff --git a/FS/FS/tax_rate.pm b/FS/FS/tax_rate.pm
index d468e60..291e2d5 100644 (file)
--- a/FS/FS/tax_rate.pm
+++ b/FS/FS/tax_rate.pm
@@ -913,10 +913,12 @@ sub process_batch_import {
                                 UNLINK   => 0,     #meh
                               ) or die "can't open temp file: $!\n";
 
+      my $insert_pattern = ($format eq 'cch-update') ? qr/"I"\s*$/ : qr/I\s*$/;
+      my $delete_pattern = ($format eq 'cch-update') ? qr/"D"\s*$/ : qr/D\s*$/;
       while(<$fh>) {
         my $handle = '';
-        $handle = $ifh if $_ =~ /"I"\s*$/;
-        $handle = $dfh if $_ =~ /"D"\s*$/;
+        $handle = $ifh if $_ =~ /$insert_pattern/;
+        $handle = $dfh if $_ =~ /$delete_pattern/;
         unless ($handle) {
           $error = "bad input line: $_" unless $handle;
           last;