diff options
| author | jeff <jeff> | 2009-02-12 19:48:24 +0000 |
|---|---|---|
| committer | jeff <jeff> | 2009-02-12 19:48:24 +0000 |
| commit | 38c9750a1c91c591b2c6df5c5dbcfa60dd8eb682 (patch) | |
| tree | d6ece9b1eb48a23103119d0de1a2147a04fe333d | |
| parent | 07a313acb1d91488c6aa6044771f3136d5a6fe11 (diff) | |
proper match arguments help
| -rw-r--r-- | FS/FS/cust_tax_location.pm | 2 | ||||
| -rw-r--r-- | FS/FS/tax_rate.pm | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/FS/FS/cust_tax_location.pm b/FS/FS/cust_tax_location.pm index bb61089..16a79db 100644 --- 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 --- 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; |