[freeside-commits] freeside/FS/FS cust_tax_location.pm, 1.5, 1.6 tax_rate.pm, 1.18, 1.19

[Jeff Finucane,420,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv24367

Modified Files:
	cust_tax_location.pm tax_rate.pm 
Log Message:
proper match arguments help

Index: tax_rate.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/tax_rate.pm,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- tax_rate.pm	5 Feb 2009 21:02:25 -0000	1.18
+++ tax_rate.pm	12 Feb 2009 19:48:24 -0000	1.19
@@ -913,10 +913,12 @@
                                 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;

Index: cust_tax_location.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_tax_location.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- cust_tax_location.pm	10 Dec 2008 02:47:57 -0000	1.5
+++ cust_tax_location.pm	12 Feb 2009 19:48:23 -0000	1.6
@@ -211,7 +211,7 @@
 
   } 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