projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
these errors are fatal for now, and fix them, RT#83146, RT#40206
[freeside.git]
/
FS
/
bin
/
freeside-cdr-asterisk_sql
diff --git
a/FS/bin/freeside-cdr-asterisk_sql
b/FS/bin/freeside-cdr-asterisk_sql
index
a5a570d
..
cd765de
100755
(executable)
--- a/
FS/bin/freeside-cdr-asterisk_sql
+++ b/
FS/bin/freeside-cdr-asterisk_sql
@@
-130,10
+130,12
@@
while ( my $row = $sth->fetchrow_hashref ) {
$cdr->cdrbatchnum($cdrbatchnum);
$cdr->cdrbatchnum($cdrbatchnum);
+ $cdr->amaflags('') unless $cdr->amaflags =~ /^(\d+)$/;
+
if ( my $error = $cdr->insert ) {
if ( my $error = $cdr->insert ) {
- log_
msg
( error =>
- sprintf '
Non-fatal failure to import acct
id(%s) from table(%s): %s',
- $row->
acctid
,
+ log_
and_die
( error =>
+ sprintf '
Fatal failure to import unique
id(%s) from table(%s): %s',
+ $row->
{'uniqueid'}
,
$table,
$error
);
$table,
$error
);
@@
-149,7
+151,7
@@
while ( my $row = $sth->fetchrow_hashref ) {
@args = ( undef );
} else {
$usql .= ' uniqueid = ?';
@args = ( undef );
} else {
$usql .= ' uniqueid = ?';
- @args = ( $row->{'uniqueid'} );
+ @args = (
undef,
$row->{'uniqueid'} );
}
} else {
$usql .= ' calldate = ? AND src = ? AND dst = ?';
}
} else {
$usql .= ' calldate = ? AND src = ? AND dst = ?';
@@
-159,9
+161,9
@@
while ( my $row = $sth->fetchrow_hashref ) {
if ( $dbi->do($usql, @args) ) {
$updates++;
} else {
if ( $dbi->do($usql, @args) ) {
$updates++;
} else {
- log_
msg
( error =>
- sprintf '
Non-fatal failure set status(done) acct
id(%s) table(%s): %s',
- $row->
acctid
,
+ log_
and_die
( error =>
+ sprintf '
Fatal failure set status(done) unique
id(%s) table(%s): %s',
+ $row->
{'uniqueid'}
,
$table,
$dbi->errstr
);
$table,
$dbi->errstr
);