From: cmzmasek@gmail.com <cmzmasek@gmail.com@ca865154-3058-d1c3-3e42-d8f55a55bdbd>
Date: Fri, 10 Jan 2014 04:31:11 +0000 (+0000)
Subject: inprogress
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=af5b37d5113266b2e849729ff1c0b5ef94e628f9;p=jalview.git

inprogress
---

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