projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SMSC CDRs (Kannel) and cdrtypenum option on cdr sftp import script, RT10991
[freeside.git]
/
FS
/
FS
/
Record.pm
diff --git
a/FS/FS/Record.pm
b/FS/FS/Record.pm
index
3511fe7
..
ffeabcb
100644
(file)
--- a/
FS/FS/Record.pm
+++ b/
FS/FS/Record.pm
@@
-1853,10
+1853,12
@@
sub batch_import {
next if $line =~ /^\s*$/; #skip empty lines
$line = &{$row_callback}($line) if $row_callback;
next if $line =~ /^\s*$/; #skip empty lines
$line = &{$row_callback}($line) if $row_callback;
+
+ next if $line =~ /^\s*$/; #skip empty lines
$parser->parse($line) or do {
$dbh->rollback if $oldAutoCommit;
$parser->parse($line) or do {
$dbh->rollback if $oldAutoCommit;
- return "can't parse: ". $parser->error_input();
+ return "can't parse: ". $parser->error_input()
. " " . $parser->error_diag
;
};
@columns = $parser->fields();
};
@columns = $parser->fields();
@@
-1925,7
+1927,7
@@
sub batch_import {
next if exists( $param->{skiprow} );
if ( $preinsert_callback ) {
next if exists( $param->{skiprow} );
if ( $preinsert_callback ) {
- my $error = &{$p
ost
insert_callback}($record, $param);
+ my $error = &{$p
re
insert_callback}($record, $param);
if ( $error ) {
$dbh->rollback if $oldAutoCommit;
return "preinsert_callback error". ( $line ? " for $line" : '' ).
if ( $error ) {
$dbh->rollback if $oldAutoCommit;
return "preinsert_callback error". ( $line ? " for $line" : '' ).