From ad3ae9e9f2c230edb25967afc12418626ecf0f45 Mon Sep 17 00:00:00 2001 From: Simon Brent <sb23@sanger.ac.uk> Date: Wed, 19 Oct 2011 12:21:02 +0000 Subject: [PATCH] merging changes from branch-ensembl-64 --- .../Bio/EnsEMBL/Utils/ConversionSupport.pm | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/Bio/EnsEMBL/Utils/ConversionSupport.pm b/modules/Bio/EnsEMBL/Utils/ConversionSupport.pm index b9f7c85fd7..1662a322dd 100644 --- a/modules/Bio/EnsEMBL/Utils/ConversionSupport.pm +++ b/modules/Bio/EnsEMBL/Utils/ConversionSupport.pm @@ -165,23 +165,23 @@ sub parse_common_options { # if logpath & logfile are not set, set them here to /ensemblweb/vega_dev/shared/logs/conversion/DBNAME/SCRIPNAME_NN.log - if (defined($self->param('log_base_path'))) { - my $dbname = $self->param('dbname'); - $dbname =~ s/^vega_//; - if (not (defined($self->param('logpath')))){ - $self->param('logpath', $self->param('log_base_path')."/".$dbname."/" ); - } - if ( (not defined $self->param('logfile') ) && (not defined $self->param('nolog') ) ){ - my $log = $Script; - $log =~ s/.pl$//g; - my $counter; - for ($counter=1 ; (-e $self->param('logpath')."/".$log."_".sprintf("%03d", $counter).".log"); $counter++){ + if (! defined($self->param('log_base_path'))) { + $self->param('log_base_path','/ensemblweb/shared/logs/conversion/'); + } + my $dbname = $self->param('dbname'); + $dbname =~ s/^vega_//; + if (not (defined($self->param('logpath')))){ + $self->param('logpath', $self->param('log_base_path')."/".$dbname."/" ); + } + if ( (not defined $self->param('logfile') ) && (not defined $self->param('nolog') ) ){ + my $log = $Script; + $log =~ s/.pl$//g; + my $counter; + for ($counter=1 ; (-e $self->param('logpath')."/".$log."_".sprintf("%03d", $counter).".log"); $counter++){ # warn $self->param('logpath')."/".$log."_".$counter.".log"; - } - $self->param('logfile', $log."_".sprintf("%03d", $counter).".log"); } + $self->param('logfile', $log."_".sprintf("%03d", $counter).".log"); } - return(1); } -- GitLab