projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
16c549d
)
fix startdate in sansay CDR import (and skip blank lines), RT#6801
author
ivan
<ivan>
Thu, 3 Dec 2009 07:38:06 +0000
(07:38 +0000)
committer
ivan
<ivan>
Thu, 3 Dec 2009 07:38:06 +0000
(07:38 +0000)
FS/FS/Record.pm
patch
|
blob
|
history
FS/FS/cdr/sansay.pm
patch
|
blob
|
history
diff --git
a/FS/FS/Record.pm
b/FS/FS/Record.pm
index
e02a2cf
..
b05fb3e
100644
(file)
--- a/
FS/FS/Record.pm
+++ b/
FS/FS/Record.pm
@@
-1767,6
+1767,8
@@
sub batch_import {
last unless scalar(@buffer);
$line = shift(@buffer);
last unless scalar(@buffer);
$line = shift(@buffer);
+ next if $line =~ /^\s*$/; #skip empty lines
+
$parser->parse($line) or do {
$dbh->rollback if $oldAutoCommit;
return "can't parse: ". $parser->error_input();
$parser->parse($line) or do {
$dbh->rollback if $oldAutoCommit;
return "can't parse: ". $parser->error_input();
diff --git
a/FS/FS/cdr/sansay.pm
b/FS/FS/cdr/sansay.pm
index
a20cff1
..
8087c57
100644
(file)
--- a/
FS/FS/cdr/sansay.pm
+++ b/
FS/FS/cdr/sansay.pm
@@
-64,7
+64,7
@@
use FS::cdr qw( _cdr_date_parser_maker _cdr_min_parser_maker );
#Start Time of Date 32 Indicates Time of Date when the call
# entered the system
#Start Time of Date 32 Indicates Time of Date when the call
# entered the system
- _cdr_date_parser_maker('startd
d
ate'),
+ _cdr_date_parser_maker('startdate'),
#Answer Time of Date 32 Indicates TOD when the call was
# answered
#Answer Time of Date 32 Indicates TOD when the call was
# answered