[freeside-commits] branch master updated. 926b02216b16ef746a10c5e150596977a198a0fd

[Ivan]

The branch, master has been updated
       via  926b02216b16ef746a10c5e150596977a198a0fd (commit)
      from  f8066fa6a33f4ac33beec675b17de96c8c0a274b (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 926b02216b16ef746a10c5e150596977a198a0fd
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Aug 7 12:02:38 2014 -0700

    fix aradial usage import, RT#29053

diff --git a/bin/aradial-sftp_and_import b/bin/aradial-sftp_and_import
old mode 100644
new mode 100755
index 425fc0b..e6af710
--- a/bin/aradial-sftp_and_import
+++ b/bin/aradial-sftp_and_import
@@ -6,7 +6,7 @@ use strict;
 use Getopt::Std;
 use Text::CSV_XS;
 use DBI;
-use FS::UID qw( adminsuidsetup datasrc );
+#use FS::UID qw( adminsuidsetup datasrc );
 
 our %aradial2db = (
   #'Date' => '',
@@ -40,10 +40,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 = '%%%FREESIDE_CACHE%%%/cache.DBI:Pg:dbname=freeside/cdrs';
 mkdir $cachedir unless -d $cachedir;
 
 my $servername = shift or die &usage;
@@ -188,7 +189,7 @@ sub usage {
   "Usage:
   aradial-sftp_and_import [ -m method ] [ -a ] [ -b ]
     [ -r remotefolder ] [ -d donefolder ] [ -v level ] [ -P port ]
-    user [sftpuser@]servername
+    user [sftpuser@]servername dbi_datasrc dbi_username dbi_pass
   ";
 }
 

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

Summary of changes:
 bin/aradial-sftp_and_import |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 bin/aradial-sftp_and_import