X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=bin%2Faradial-sftp_and_import;h=923c674bacb6d61388942187e4e9411fa8f6fc0c;hb=bc6393f0c5d8d3c797a22ed0280f18fe3ff32210;hp=95546e40599a972b54c616f4c3fbfaf60a2137d2;hpb=2a04f28fa2427e9d61f54fe631d0e455cf9945ac;p=freeside.git

diff --git a/bin/aradial-sftp_and_import b/bin/aradial-sftp_and_import
old mode 100644
new mode 100755
index 95546e405..923c674ba
--- a/bin/aradial-sftp_and_import
+++ b/bin/aradial-sftp_and_import
@@ -6,7 +6,8 @@ use strict;
 use Getopt::Std;
 use Text::CSV_XS;
 use DBI;
-use FS::UID qw( adminsuidsetup datasrc );
+use Net::SFTP::Foreign;
+#use FS::UID qw( adminsuidsetup datasrc );
 
 our %aradial2db = (
   #'Date' => '',
@@ -40,10 +41,11 @@ getopts('m:abr:dP:v:');
 my %options = ();
 
 my $user = shift or die &usage;
-adminsuidsetup $user;
+#adminsuidsetup $user;
 
-# %%%FREESIDE_CACHE%%%
-my $cachedir = '%%%FREESIDE_CACHE%%%/cache.'. datasrc. '/cdrs';
+# %%%FREESIDE_CACHE%%% & hardcoded datasrc
+#my $cachedir = '%%%FREESIDE_CACHE%%%/cache.'. datasrc. '/cdrs';
+my $cachedir = '/usr/local/etc/freeside/cache.DBI:Pg:dbname=freeside/cdrs';
 mkdir $cachedir unless -d $cachedir;
 
 my $servername = shift or die &usage;
@@ -83,7 +85,7 @@ elsif($opt_m eq 'sftp') {
   $ls_sftp->setcwd($opt_r) or die "can't chdir to $opt_r\n"
     if $opt_r;
 
-  $ls = $ls_sftp->ls('.', wanted => qr/^$.*\.$/i,
+  $ls = $ls_sftp->ls('.', no_wanted  => qr/^\.+$/,
                           names_only => 1 );
 }
 else {
@@ -188,7 +190,7 @@ sub usage {
   "Usage:
   aradial-sftp_and_import [ -m method ] [ -a ] [ -b ]
     [ -r remotefolder ] [ -d donefolder ] [ -v level ] [ -P port ]
-    user format [sftpuser@]servername
+    user [sftpuser@]servername dbi_datasrc dbi_username dbi_pass
   ";
 }
 
@@ -229,7 +231,7 @@ freeside-aradial-sftp_and_import - Download Aradial "CDR" (really RADIUS detail)
 
   aradial-sftp_and_import [ -m method ] [ -a ] [ -b ]
     [ -r remotefolder ] [ -d donefolder ] [ -v level ] [ -P port ]
-    user format [sftpuser@]servername dbi_datasrc dbi_username dbi_pass
+    user [sftpuser@]servername dbi_datasrc dbi_username dbi_pass
 
 =head1 DESCRIPTION
 
@@ -253,8 +255,6 @@ or FTP and then import them into the database.
 
 user: freeside username
 
-format: CDR format name
-
 [sftpuser@]servername: remote server
 (or ftpuser:ftppass@servername)