[freeside-commits] branch FREESIDE_4_BRANCH updated. 7b45b98a32323af93e24369650fb39f9427e4e7f
Ivan
ivan at 420.am
Mon Jul 17 18:11:44 PDT 2017
The branch, FREESIDE_4_BRANCH has been updated
via 7b45b98a32323af93e24369650fb39f9427e4e7f (commit)
via d9ecec9ab1d2ad796e23a265692b620aadbc0710 (commit)
via 02db3c01e8cec949798ee2787743a7202783d538 (commit)
from 83a2fad4d539394bbac5ea51da859718b955c706 (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 7b45b98a32323af93e24369650fb39f9427e4e7f
Author: Ivan Kohler <ivan at freeside.biz>
Date: Mon Jul 17 18:11:40 2017 -0700
change voip innovations CDR retrieval hostname, RT#76784
diff --git a/FS/bin/freeside-voipinnovations-cdrimport b/FS/bin/freeside-voipinnovations-cdrimport
index 484b330..23ea6bb 100755
--- a/FS/bin/freeside-voipinnovations-cdrimport
+++ b/FS/bin/freeside-voipinnovations-cdrimport
@@ -37,7 +37,7 @@ my %exists = map {$_->cdrbatch => 1} @previous;
my $tempdir = tempdir( CLEANUP => !$opt_v );
my $format = 'voip_innovations';
-my $hostname = 'cdrs.globalpopsvoip.com';
+my $hostname = 'customercdr.voipinnovations.com';
my $ftp = Net::FTP->new($hostname, Debug => $opt_d)
or die "Can't connect to $hostname: $@\n";
commit d9ecec9ab1d2ad796e23a265692b620aadbc0710
Author: Ivan Kohler <ivan at freeside.biz>
Date: Mon Jul 17 18:03:31 2017 -0700
CDR import scripts converted to real commands
diff --git a/bin/cdr-vitelity.import b/bin/cdr-vitelity.import
deleted file mode 100755
index 55eb8cc..0000000
--- a/bin/cdr-vitelity.import
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/usr/bin/perl
-
-=pod
-
-cdr-vitelity.import [ -v ] [ -k ]
- -s date -e date
- username
- [ exportnum ]
-
-Download CDRs using the Vitelity API.
-
--v: Be verbose.
-
--k: Keep the .csv file for debugging purposes, instead of deleting it.
-
--s date: Import only records on or after 'date' Now required as the Vitelity
-API has changed.
-
--e date: Import only records before 'date'. Now required as the Vitelity API
-has changed.
-
-username: a Freeside user
-
-exportnum: Run only for that export. If not specified, this will run for
-all Vitelity exports.
-
-=cut
-
-use strict;
-use FS::UID qw(adminsuidsetup dbh);
-use FS::Record qw(qsearchs qsearch);
-use FS::cdr;
-use FS::part_export;
-use Getopt::Std;
-use File::Temp;
-use Date::Format 'time2str';
-use Date::Parse 'str2time';
-
-my %opt;
-getopts('vks:e:', \%opt);
-
-my $user = shift or die &usage;
-my $exportnum = shift;
-my $dbh = adminsuidsetup $user;
-
-my $start = $opt{'s'} ? str2time($opt{'s'}) : die &usage('-s is now required');
-my $end = $opt{'e'} ? str2time($opt{'e'}) : die &usage('-e is now required');
-
-local $FS::UID::AutoCommit = 0;
-
-my @part_exports;
-if ( $exportnum ) {
- @part_exports = ( qsearchs('part_export', { 'exportnum' => $exportnum }) )
- or die "exportnum $exportnum not found\n";
-}
-else {
- @part_exports = qsearch('part_export', { 'exporttype' => 'vitelity' })
- or die "no Vitelity exports found\n";
-}
-
-foreach my $export (@part_exports) {
- my $exportnum = $export->exportnum;
- print "Processing exportnum $exportnum.\n" if $opt{'v'};
- $export->isa('FS::part_export::vitelity')
- or die "exportnum $exportnum is not a Vitelity export\n";
-
- my $dir = $FS::UID::cache_dir . "/cache.". $FS::UID::datasrc;
- my $temp = new File::Temp ( TEMPLATE => 'download.XXXXXXXX',
- SUFFIX => '.csv',
- DIR => $dir,
- UNLINK => !$opt{'k'} )
- or die "can't open temporary file to store download: $!\n";
- print "Downloading to ".$temp->filename."\n" if $opt{'v'};
-
- print "Sending API request..." if $opt{'v'};
-
- my $s = time2str('%m-%d-%Y', $start);
- my $e = time2str('%m-%d-%Y', $end);
-
- my @records = eval { $export->vitelity_command('getcdr',
- 'startdate' => $s,
- 'enddate' => $e,
- );
- };
- if ( $@ ) {
- print "download error: $@\n";
- exit(-1);
- }
-
- print "received ".scalar(@records)." records\n" if $opt{'v'};
- if ( !@records ) {
- print "No records to process.\n" if $opt{'v'};
- exit(1);
- }
-
- print $temp "Date,Source,Destination,Seconds,CallerID,Disposition,Cost\n";
-
- while (my $rec = shift @records) {
- print $temp $rec, "\n";
- }
- close $temp;
-
- my $format = 'vitelity';
- my $batchname = "vitelity-$exportnum-".time2str('%Y/%m/%d-%T',time);
-
- print "Importing batch..." if $opt{'v'};
- my $error = FS::cdr::batch_import( {
- 'file' => $temp->filename,
- 'format' => $format,
- 'batch_namevalue' => $batchname,
- } );
-
- if ( $error ) {
- $dbh->rollback;
- print "error: $error";
- exit(-2);
- }
-}
-$dbh->commit;
-print "done.\n";
-exit(0);
-
-sub usage {
- my $err = @_ ? shift."\n\n" : '';
-$err."Usage:
-cdr-vitelity.import [ -v ] [ -k ]
- -s date -e date
- username
- [ exportnum ]
-";
-}
-
commit 02db3c01e8cec949798ee2787743a7202783d538
Author: Ivan Kohler <ivan at freeside.biz>
Date: Mon Jul 17 18:01:40 2017 -0700
CDR import scripts converted to real commands
diff --git a/bin/cdr-voip_innovations.import b/bin/cdr-voip_innovations.import
deleted file mode 100755
index 31a3e7c..0000000
--- a/bin/cdr-voip_innovations.import
+++ /dev/null
@@ -1,129 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use Getopt::Std;
-use Date::Format;
-use File::Temp 'tempdir';
-use Net::FTP;
-use FS::UID qw(adminsuidsetup datasrc dbh);
-use FS::cdr;
-use FS::cdr_batch;
-use FS::Record qw(qsearch qsearchs);
-use Date::Format 'time2str';
-use Date::Parse 'str2time';
-
-
-###
-# parse command line
-###
-
-use vars qw( $opt_d $opt_v $opt_c $opt_s $opt_e $opt_a );
-getopts('dvc:s:e:a');
-
-my ($user, $login, $password) = @ARGV;
-$user and $login and $password or die &usage;
-
-my $dbh = adminsuidsetup $user;
-$FS::UID::AutoCommit = 0;
-
-# index already-downloaded batches
-my @previous = qsearch({
- 'table' => 'cdr_batch',
- 'hashref' => { 'cdrbatch' => {op=>'like', value=>'voip_innovations%'} },
- 'order_by' => 'ORDER BY cdrbatch DESC',
-});
-my %exists = map {$_->cdrbatch => 1} @previous;
-
-my $tempdir = tempdir( CLEANUP => !$opt_v );
-
-my $format = 'voip_innovations';
-my $hostname = 'cdrs.globalpopsvoip.com';
-
-my $ftp = Net::FTP->new($hostname, Debug => $opt_d)
- or die "Can't connect to $hostname: $@\n";
-
-$ftp->login($login, $password)
- or die "Login failed: ".$ftp->message."\n";
-
-###
-# get the file list
-###
-
-warn "Retrieving directory listing\n" if $opt_v;
-
-$ftp->cwd('/');
-my @dirs = $ftp->ls();
-warn scalar(@dirs)." directories found.\n" if $opt_v;
-# apply date range
-if ( $opt_a ) {
- my $most_recent = $previous[0];
- if ($most_recent) {
- if ($most_recent->cdrbatch =~ /^voip_innovations-(\d+)/) {
- my $date = $1;
- warn "limiting to dates > $date (from most recent batch)\n" if $opt_v;
- @dirs = grep {$_ > $date} @dirs;
- }
- } # else download them all
-}
-if ( $opt_s ) {
- # start date
- # normalize date format
- $opt_s = time2str('%Y%m%d', str2time($opt_s)) if $opt_s =~ /\D/;
- warn "limiting to dates > $opt_s\n" if $opt_v;
- @dirs = grep {$_ > $opt_s} @dirs;
-}
-if ( $opt_e ) {
- # end date
- $opt_e = time2str('%Y%m%d', str2time($opt_e)) if $opt_e =~ /\D/;
- warn "limiting to dates < $opt_e\n" if $opt_v;
- @dirs = grep {$_ < $opt_e} @dirs;
-}
-warn scalar(@dirs) ." to be downloaded\n" if $opt_v;
-foreach my $dir (@dirs) {
- $ftp->cwd($dir);
- foreach my $file ($ftp->ls) {
- warn "downloading $file\n" if $opt_v;
- $ftp->get($file, "$tempdir/$file");
- warn "processing $file\n" if $opt_v;
-
- # "voip_innovations-20130628/20130628_20130628.CDR"
- my $batchname = "$format-$dir/$file";
- if ($exists{$batchname}) {
- warn "already imported $file\n";
- next;
- }
- my $import_options = {
- 'file' => "$tempdir/$file",
- 'format' => $format,
- 'batch_namevalue' => $batchname,
- 'empty_ok' => 1,
- };
- $import_options->{'cdrtypenum'} = $opt_c if $opt_c;
-
- my $error = FS::cdr::batch_import($import_options);
-
- if ( $error ) {
- die "error processing $dir/$file: $error\n";
- }
- }
- $ftp->cwd('..');
-}
-warn "finished\n";
-$dbh->commit;
-
-###
-# subs
-###
-
-sub usage {
- "Usage: \n cdr-voip_innovations.import user login password\n [ options ]
- Options:
- -v: be verbose
- -d: enable FTP debugging (very noisy)
- -c num: apply a cdrtypenum to the imported CDRs
- -s date: start date
- -e date: end date
- -a: automatically choose start date from most recently downloaded batch
- ";
-}
-
-----------------------------------------------------------------------
Summary of changes:
FS/bin/freeside-voipinnovations-cdrimport | 2 +-
bin/cdr-vitelity.import | 132 -----------------------------
bin/cdr-voip_innovations.import | 129 ----------------------------
3 files changed, 1 insertion(+), 262 deletions(-)
delete mode 100755 bin/cdr-vitelity.import
delete mode 100755 bin/cdr-voip_innovations.import
More information about the freeside-commits
mailing list