projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c782a49
)
add datestamp to batch name derived from filename, remove temp files for all errors...
author
ivan
<ivan>
Thu, 22 Sep 2011 00:38:38 +0000
(
00:38
+0000)
committer
ivan
<ivan>
Thu, 22 Sep 2011 00:38:38 +0000
(
00:38
+0000)
FS/bin/freeside-cdr-sftp_and_import
patch
|
blob
|
history
diff --git
a/FS/bin/freeside-cdr-sftp_and_import
b/FS/bin/freeside-cdr-sftp_and_import
index
039941c
..
7f2693f
100755
(executable)
--- a/
FS/bin/freeside-cdr-sftp_and_import
+++ b/
FS/bin/freeside-cdr-sftp_and_import
@@
-105,10
+105,12
@@
foreach my $filename ( @$ls ) {
}
}
}
}
+ my $file_timestamp = $filename.'-'.time2str('%Y-%m-%d', time);
+
my $import_options = {
'file' => "$cachedir/$ungziped",
'format' => $format,
my $import_options = {
'file' => "$cachedir/$ungziped",
'format' => $format,
- 'batch_namevalue' => $file
name.'-'.time2str('%Y-%m-%d', time)
,
+ 'batch_namevalue' => $file
_timestamp
,
'empty_ok' => 1,
};
$import_options->{'cdrtypenum'} = $opt_c if $opt_c;
'empty_ok' => 1,
};
$import_options->{'cdrtypenum'} = $opt_c if $opt_c;
@@
-123,7
+125,7
@@
foreach my $filename ( @$ls ) {
if ( $opt_d ) {
if($opt_m eq 'ftp') {
my $ftp = ftp();
if ( $opt_d ) {
if($opt_m eq 'ftp') {
my $ftp = ftp();
- $ftp->rename($filename, "$opt_d/$file
name
")
+ $ftp->rename($filename, "$opt_d/$file
_timestamp
")
or do {
unlink "$cachedir/$filename";
unlink "$cachedir/$ungziped" if $opt_g;
or do {
unlink "$cachedir/$filename";
unlink "$cachedir/$ungziped" if $opt_g;
@@
-132,7
+134,7
@@
foreach my $filename ( @$ls ) {
}
else {
my $sftp = sftp();
}
else {
my $sftp = sftp();
- $sftp->rename($filename, "$opt_d/$file
name
")
+ $sftp->rename($filename, "$opt_d/$file
_timestamp
")
or do {
unlink "$cachedir/$filename";
unlink "$cachedir/$ungziped" if $opt_g;
or do {
unlink "$cachedir/$filename";
unlink "$cachedir/$ungziped" if $opt_g;