[freeside-commits] branch master updated. f6a21d8aa8eb308a3764515297b32562888a46e1

[Ivan]

The branch, master has been updated
       via  f6a21d8aa8eb308a3764515297b32562888a46e1 (commit)
      from  64aec88c35418b8c630811cdf5afb19b2a1c4299 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f6a21d8aa8eb308a3764515297b32562888a46e1
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Aug 25 17:19:17 2016 -0700

    import asterisk CDRs without a uniqueid, RT#72090

diff --git a/FS/bin/freeside-cdr-asterisk_sql b/FS/bin/freeside-cdr-asterisk_sql
index 4d4d648..4b5bcc8 100755
--- a/FS/bin/freeside-cdr-asterisk_sql
+++ b/FS/bin/freeside-cdr-asterisk_sql
@@ -9,6 +9,8 @@ use FS::cdr;
 use DBI;
 use Getopt::Std;
 
+$DEBUG = 0;
+
 my %opt;
 getopts('e:H:U:P:D:T:', \%opt);
 my $user = shift or die &usage;
@@ -32,21 +34,35 @@ my $table = $opt{T} || 'cdr';
 if ( $engine =~ /^mysql/ ) {
   my $status = $dbi->selectall_arrayref("SHOW COLUMNS FROM $table WHERE Field = 'freesidestatus'");
   if( ! @$status ) {
-    print "Adding freesidestatus column...\n";
+    warn "Adding freesidestatus column...\n" if $DEBUG;
     $dbi->do("ALTER TABLE $table ADD COLUMN freesidestatus varchar(32)")
       or die $dbi->errstr;
   } else {
-    print "freesidestatus column present\n";
+    warn "freesidestatus column present\n" if $DEBUG;
   }
 }
 
-my @cols = ( qw( 
-calldate clid src dst dcontext channel lastapp lastdata duration 
-    billsec disposition amaflags accountcode uniqueid userfield) );
-my $sql = 'SELECT '.join(',', @cols). " FROM $table WHERE freesidestatus IS NULL";
+my @cols = (qw( 
+  calldate clid src dst dcontext channel lastapp lastdata duration 
+  billsec disposition amaflags accountcode userfield
+));
+
+# check for existence of uniqueid
+if ( $engine =~ /^mysql/ ) {
+  my $status = $dbi->selectall_arrayref("SHOW COLUMNS FROM $table WHERE Field = 'uniqueid'");
+  if( @$status ) {
+    push @cols, 'uniqueid';
+  }
+} else {
+  #assume there's a uniqueid
+  push @cols, 'uniqueid';
+}
+
+my $sql =
+  'SELECT '.join(',', @cols). " FROM $table WHERE freesidestatus IS NULL";
 my $sth = $dbi->prepare($sql);
 $sth->execute;
-print "Importing ".$sth->rows." records...\n";
+warn "Importing ".$sth->rows." records...\n" if $DEBUG;
 
 my $cdr_batch = new FS::cdr_batch({ 
     'cdrbatch' => 'sql-import-'. time2str('%Y/%m/%d-%T',time),
@@ -63,8 +79,8 @@ while ( $row = $sth->fetchrow_hashref ) {
   $cdr->startdate(str2time($cdr->calldate));
   $cdr->cdrbatchnum($cdrbatchnum);
   my $error = $cdr->insert;
-  if($error) {
-    print "failed import: $error\n";
+  if ($error) {
+    warn "failed import: $error\n";
   }
   else {
     $imports++;
@@ -77,13 +93,13 @@ while ( $row = $sth->fetchrow_hashref ) {
 
       ) ) {
         $updates++;
-    }
-    else {
-      print "failed to set status: ".$dbi->errstr."\n";
+    } else {
+      warn "failed to set status: ".$dbi->errstr."\n";
     }
   }
 }
-print "Done.\nImported $imports CDRs, marked $updates CDRs as done.\n";
+
+warn "Done.\nImported $imports CDRs, marked $updates CDRs as done.\n";
 $dbi->disconnect;
 
 sub usage {
@@ -96,12 +112,24 @@ freeside-cdr-asterisk_sql - Import CDRs from an Asterisk SQL database
 
 =head1 SYNOPSIS
 
-  freeside-cdr-asterisk_sql -e mysql|Pg|... [ -H host ] -D database -U user -P password freesideuser
+  freeside-cdr-asterisk_sql -e mysql|Pg|... [ -H host ] -D database [ -T table ] -U user -P password [ -s ] freesideuser
 
 =head1 DESCRIPTION
 
 Imports CDR records from an Asterisk SQL database.
 
+-H: hostname
+
+-e: Database engine (default mysql)
+
+-D: database name
+
+-T: table name (default cdr)
+
+-U: username
+
+-P: password
+
 =cut
 
 1;

-----------------------------------------------------------------------

Summary of changes:
 FS/bin/freeside-cdr-asterisk_sql |   56 ++++++++++++++++++++++++++++----------
 1 file changed, 42 insertions(+), 14 deletions(-)