diff options
| author | jeff <jeff> | 2010-03-07 18:07:03 +0000 |
|---|---|---|
| committer | jeff <jeff> | 2010-03-07 18:07:03 +0000 |
| commit | 919bcddcb7a1ec551d27faac925fedc7d9644f3c (patch) | |
| tree | d361369282c2929d3b944d657dee80a952281065 /FS/FS/tax_rate.pm | |
| parent | d602e554d0a26d52c00705f8f8baa384f2021e6d (diff) | |
pass format and correct filenames
Diffstat (limited to 'FS/FS/tax_rate.pm')
| -rw-r--r-- | FS/FS/tax_rate.pm | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/FS/FS/tax_rate.pm b/FS/FS/tax_rate.pm index 351c3f7..9bcd697 100644 --- a/FS/FS/tax_rate.pm +++ b/FS/FS/tax_rate.pm @@ -959,9 +959,9 @@ sub _perform_batch_import { unless $keep_cch_files; push @insert_list, $name, $insertname, $import_sub, $format; if ( $name eq 'GEOCODE' ) { #handle this whole ordering issue better - unshift @predelete_list, $name, $deletename, $import_sub; + unshift @predelete_list, $name, $deletename, $import_sub, $format; } else { - unshift @delete_list, $name, $deletename, $import_sub; + unshift @delete_list, $name, $deletename, $import_sub, $format; } } else { @@ -1655,10 +1655,9 @@ sub process_download_and_update { warn "processing $dir.new/$name.txt\n" if $DEBUG; my $olddir = $update ? "$dir.1" : ""; $difffile = _perform_cch_diff( $name, "$dir.new", $olddir ); - } else { - $difffile =~ s/^$cache_dir//; - push @list, "${name}file:$difffile"; } + $difffile =~ s/^$cache_dir//; + push @list, "${name}file:$difffile"; } # perform the import |