use uniqueid if id is missing in v12, RT#83146

[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..97e4758 100755 (executable)
--- a/FS/bin/freeside-cdr-asterisk_sql
+++ b/FS/bin/freeside-cdr-asterisk_sql
@@ -130,6 +130,8 @@ while ( my $row = $sth->fetchrow_hashref ) {
 
   $cdr->cdrbatchnum($cdrbatchnum);
 
 
   $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',
   if ( my $error = $cdr->insert ) {
     log_msg( error =>
       sprintf 'Non-fatal failure to import acctid(%s) from table(%s): %s',


@@ -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 = ?';