diff --git a/runPipeline b/runPipeline index 3a0a311f..8cdb49e4 100755 --- a/runPipeline +++ b/runPipeline @@ -727,17 +727,16 @@ sub read_SRAD_Download_dir opendir(my $sra_dir_fh,$dir) or die "Cannot read $dir\n"; my @files = sort grep {/fastq/} readdir($sra_dir_fh); closedir $sra_dir_fh; - if (!@files && !@pairedReadsFile && !@unpairedReadsFile) + if (`grep -i -a "Error" $dir/log.txt`){ + &lprint("The SRA download failed.\n"); + exit; + }elsif (!@files && !@pairedReadsFile && !@unpairedReadsFile) { &lprint("No fastq file from the SRA download. try again\n"); &Download_SRA(); + return; #die "No input\n"; } - if (`grep -i -a "Error" $dir/log.txt`){ - `rm -rf $dir/*fastq*`; - &lprint("The SRA download failed. try again\n"); - &Download_SRA(); - } my %pair; if (scalar(@files)==1) { diff --git a/scripts/munger/outputMunger_w_temp.pl b/scripts/munger/outputMunger_w_temp.pl index 5d5e6939..2ef378ef 100755 --- a/scripts/munger/outputMunger_w_temp.pl +++ b/scripts/munger/outputMunger_w_temp.pl @@ -935,6 +935,7 @@ sub pull_blast { sub pull_sra_download { my $err; $err = `grep Failed $out_dir/SRA_Download/log.txt` if (-e "$out_dir/SRA_Download/log.txt"); + $err .= `grep "ERROR" $out_dir/SRA_Download/log.txt` if (-e "$out_dir/SRA_Download/log.txt"); if ($err){ $err =~ s/(http\S+)/$1<\/a>/; $vars->{SRADERR} = $err;