diff options
| author | mark <mark> | 2010-02-10 02:13:02 +0000 |
|---|---|---|
| committer | mark <mark> | 2010-02-10 02:13:02 +0000 |
| commit | 918241f61b03f292593144c7ab686b8c66bd8dd2 (patch) | |
| tree | df2052f28fa8cb4b199f7c53cfc822a9cd827cb5 | |
| parent | c4b9230980c0389bd25476d9652b2f42b7f08f97 (diff) | |
RT#7274: accept CR/LF in RBC batch import
| -rw-r--r-- | FS/FS/pay_batch.pm | 3 | ||||
| -rw-r--r-- | FS/FS/pay_batch/RBC.pm | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/FS/FS/pay_batch.pm b/FS/FS/pay_batch.pm index 59ff2c3a0..6a2755494 100644 --- a/FS/FS/pay_batch.pm +++ b/FS/FS/pay_batch.pm @@ -272,11 +272,12 @@ sub import_results { }; push @all_values, [ $csv->fields(), $line ]; }elsif ($filetype eq 'fixed'){ - my @values = ( $line =~ /$formatre/, $line ); + my @values = ( $line =~ /$formatre/ ); unless (@values) { $dbh->rollback if $oldAutoCommit; return "can't parse: ". $line; }; + push @values, $line; push @all_values, \@values; }else{ $dbh->rollback if $oldAutoCommit; diff --git a/FS/FS/pay_batch/RBC.pm b/FS/FS/pay_batch/RBC.pm index daf6548da..26ff95971 100644 --- a/FS/FS/pay_batch/RBC.pm +++ b/FS/FS/pay_batch/RBC.pm @@ -14,7 +14,7 @@ $name = 'RBC'; %import_info = ( 'filetype' => 'fixed', 'formatre' => - '^(.).{18}(.{4}).{3}(.).{11}(.{19}).{6}(.{30}).{17}(.{9})(.{18}).{6}(.{14}).{23}(.).{9}$', + '^(.).{18}(.{4}).{3}(.).{11}(.{19}).{6}(.{30}).{17}(.{9})(.{18}).{6}(.{14}).{23}(.).{9}\r?$', 'fields' => [ qw( recordtype batchnum |