From: cmzmasek@gmail.com <cmzmasek@gmail.com@ca865154-3058-d1c3-3e42-d8f55a55bdbd>
Date: Tue, 2 Apr 2013 23:53:04 +0000 (+0000)
Subject: inprogress
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=697105b91be43b279c9d0627248a96a67c1ddcab;p=jalview.git

inprogress
---

diff --git a/forester/ruby/evoruby/lib/evo/tool/phylogeny_factory.rb b/forester/ruby/evoruby/lib/evo/tool/phylogeny_factory.rb
index 3140baa..c0770b3 100644
--- a/forester/ruby/evoruby/lib/evo/tool/phylogeny_factory.rb
+++ b/forester/ruby/evoruby/lib/evo/tool/phylogeny_factory.rb
@@ -151,7 +151,11 @@ module Evoruby
           #if !ids.include?( id )
           #  ids.add( id )
           #end
-          puts( '[' + PRG_NAME + '] > file [id]: ' + aln_name + ' [' + id + ']' )
+          if id != nil && id.length > 0
+            puts( '[' + PRG_NAME + '] > file [id]: ' + aln_name + ' [' + id + ']' )
+          else
+            puts( '[' + PRG_NAME + '] > file [id]: ' + aln_name + ' [WARNING: could not get id!]' )
+          end
           commands.each do | cmd |
             cmd = subst_hmm( cmd, id )
             cmd = subst_min_length( cmd, id, min_lengths )
@@ -258,9 +262,6 @@ module Evoruby
       if aln_name.include? "__"
         id = aln_name[ 0, aln_name.index( "__" ) ]
       end
-      if id == nil || id.length < 1
-        puts( '[' + PRG_NAME + '] > WARNING: could not get id from [' + aln_name + ']' )
-      end
       id
     end