From af5b37d5113266b2e849729ff1c0b5ef94e628f9 Mon Sep 17 00:00:00 2001 From: "cmzmasek@gmail.com" Date: Fri, 10 Jan 2014 04:31:11 +0000 Subject: [PATCH] inprogress --- .../ruby/evoruby/lib/evo/tool/phylogenies_decorator.rb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/forester/ruby/evoruby/lib/evo/tool/phylogenies_decorator.rb b/forester/ruby/evoruby/lib/evo/tool/phylogenies_decorator.rb index 035be0b..535b1fa 100644 --- a/forester/ruby/evoruby/lib/evo/tool/phylogenies_decorator.rb +++ b/forester/ruby/evoruby/lib/evo/tool/phylogenies_decorator.rb @@ -253,17 +253,17 @@ module Evoruby if ( !File.directory?( file ) && file !~ /^\./ && file !~ /^00/ && - file =~ /^#{phylogeny_id}#{suffix_pattern}$/ ) + file =~ /^#{phylogeny_id}.*#{suffix_pattern}$/ ) matching_files << file end } if matching_files.length < 1 Util.fatal_error( PRG_NAME, 'no file matching [' + phylogeny_id + - suffix_pattern + '] present in current directory' ) + '...' + suffix_pattern + '] present in current directory' ) end if matching_files.length > 1 - Util.fatal_error( PRG_NAME, 'more than one file matching [' + phylogeny_id + - suffix_pattern + '] present in current directory' ) + Util.fatal_error( PRG_NAME, 'more than one file matching [' + + phylogeny_id + '...' + suffix_pattern + '] present in current directory' ) end matching_files[ 0 ] end @@ -282,10 +282,12 @@ module Evoruby } if matching_files.length < 1 - Util.fatal_error( PRG_NAME, 'no seq file matching [' + phylogeny_id + '__] present in current directory' ) + Util.fatal_error( PRG_NAME, 'no seq file matching [' + + phylogeny_id + '__] present in current directory' ) end if matching_files.length > 1 - Util.fatal_error( PRG_NAME, 'more than one seq file matching [' + phylogeny_id + '__] present in current directory' ) + Util.fatal_error( PRG_NAME, 'more than one seq file matching [' + + phylogeny_id + '__] present in current directory' ) end matching_files[ 0 ] end -- 1.7.10.2