X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-cdr-asterisk_sql;h=cd765deeef6e9bdbad46e06029914955405342cd;hp=a5a570d60400cb8eac16045a59786029b1a92926;hb=dde3deba8c26a17e14a71786a0dcfa9d83b44771;hpb=1f1190b8fb6d06852dbd16c6a288f9acd9cc83dd

diff --git a/FS/bin/freeside-cdr-asterisk_sql b/FS/bin/freeside-cdr-asterisk_sql
index a5a570d60..cd765deee 100755
--- 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->amaflags('') unless $cdr->amaflags =~ /^(\d+)$/;
+
   if ( my $error = $cdr->insert ) {
-    log_msg( error =>
-      sprintf 'Non-fatal failure to import acctid(%s) from table(%s): %s',
-        $row->acctid,
+    log_and_die( error =>
+      sprintf 'Fatal failure to import uniqueid(%s) from table(%s): %s',
+        $row->{'uniqueid'},
         $table,
         $error
     );
@@ -149,7 +151,7 @@ while ( my $row = $sth->fetchrow_hashref ) {
         @args = ( undef );
       } else {
         $usql .= ' uniqueid = ?';
-        @args = ( $row->{'uniqueid'} );
+        @args = ( undef, $row->{'uniqueid'} );
       }
     } else {
       $usql .= ' calldate = ? AND src = ? AND dst = ?';
@@ -159,9 +161,9 @@ while ( my $row = $sth->fetchrow_hashref ) {
     if ( $dbi->do($usql, @args) ) {
       $updates++;
     } else {
-      log_msg( error =>
-        sprintf 'Non-fatal failure set status(done) acctid(%s) table(%s): %s',
-          $row->acctid,
+      log_and_die( error =>
+        sprintf 'Fatal failure set status(done) uniqueid(%s) table(%s): %s',
+          $row->{'uniqueid'},
           $table,
           $dbi->errstr
       );