projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5493e77
)
RT#7274: accept CR/LF in RBC batch import
author
mark
<mark>
Wed, 10 Feb 2010 02:12:43 +0000
(
02:12
+0000)
committer
mark
<mark>
Wed, 10 Feb 2010 02:12:43 +0000
(
02:12
+0000)
FS/FS/pay_batch.pm
patch
|
blob
|
history
FS/FS/pay_batch/RBC.pm
patch
|
blob
|
history
diff --git
a/FS/FS/pay_batch.pm
b/FS/FS/pay_batch.pm
index
59ff2c3
..
6a27554
100644
(file)
--- 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'){
};
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;
};
unless (@values) {
$dbh->rollback if $oldAutoCommit;
return "can't parse: ". $line;
};
+ push @values, $line;
push @all_values, \@values;
}else{
$dbh->rollback if $oldAutoCommit;
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
daf6548
..
26ff959
100644
(file)
--- 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' =>
%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
'fields' => [ qw(
recordtype
batchnum