From: cmzmasek <cmzmasek@ca865154-3058-d1c3-3e42-d8f55a55bdbd>
Date: Fri, 27 Dec 2013 01:23:13 +0000 (+0000)
Subject: in progress
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b2b6a9c2cec8e4b397851121b230a233aa24b1d3;p=jalview.git

in progress
---

diff --git a/forester/ruby/evoruby/lib/evo/tool/phylogenies_decorator.rb b/forester/ruby/evoruby/lib/evo/tool/phylogenies_decorator.rb
index 6668877..52c94e0 100644
--- a/forester/ruby/evoruby/lib/evo/tool/phylogenies_decorator.rb
+++ b/forester/ruby/evoruby/lib/evo/tool/phylogenies_decorator.rb
@@ -166,8 +166,10 @@ module Evoruby
           log << counter.to_s + ': ' + phylogeny_file + ' -> ' +  outfile + NL
 
           phylogeny_id = get_id( phylogeny_file )
+          if  phylogeny_id == nil || phylogeny_id.size < 1
+            Util.fatal_error( PRG_NAME, 'could not get id from ' + phylogeny_file.to_s )
+          end
           puts
-
           Util.print_message( PRG_NAME, "id: " + phylogeny_id )
           log << "id: " + phylogeny_id + NL
 
@@ -256,11 +258,11 @@ module Evoruby
         end
       }
       if matching_files.length < 1
-        Util.fatal_error( PRG_NAME, 'no file matching [' + phylogeny_id +
+        Util.fatal_error( PRG_NAME, 'no file matching [' + phylogeny_id
            + suffix_pattern + '] present in current directory' )
       end
       if matching_files.length > 1
-        Util.fatal_error( PRG_NAME, 'more than one file matching [' + phylogeny_id +
+        Util.fatal_error( PRG_NAME, 'more than one file matching [' + phylogeny_id
            + suffix_pattern + '] present in current directory' )
       end
       matching_files[ 0 ]