X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fruby%2Fevoruby%2Flib%2Fevo%2Ftool%2Fmulti_sequence_extractor.rb;h=a868b6a8f8ef617bfe92289aa47ea61a1004b915;hb=2fd8b4253e465b0de7f15e54b8f1d9a1229831ee;hp=de143bc95a34df8dc98b80db7134a3e0cd47b2bd;hpb=bc7e61297dc69bfe515f83a49e469ed7f5093518;p=jalview.git

diff --git a/forester/ruby/evoruby/lib/evo/tool/multi_sequence_extractor.rb b/forester/ruby/evoruby/lib/evo/tool/multi_sequence_extractor.rb
index de143bc..a868b6a 100644
--- a/forester/ruby/evoruby/lib/evo/tool/multi_sequence_extractor.rb
+++ b/forester/ruby/evoruby/lib/evo/tool/multi_sequence_extractor.rb
@@ -291,8 +291,8 @@ module Evoruby
                 print_counts( per_species_counter, log, Constants::LINE_DELIMITER )
                 per_species_counter = 0
               end
-              puts " " + species_counter.to_str +  ": " + current_species + " [" + my_readlink + "]"
-              log << species_counter.to_str +  ": " + current_species + " [" + my_readlink + "]" + Constants::LINE_DELIMITER
+              puts " " + species_counter.to_s +  ":" + current_species + " [" + my_readlink + "]"
+              log << species_counter.to_s +  ": " + current_species + " [" + my_readlink + "]" + Constants::LINE_DELIMITER
               species_counter += 1
             end
             puts "   " + seq_name
@@ -314,21 +314,6 @@ module Evoruby
               Util.fatal_error( PRG_NAME, "error: seq name \"" + seq_name + "\" not unique"  )
             end
 
-            # if current_msa.find_by_name_start( seq_name, true ).size > 0
-            #   begin
-            #     seq = current_msa.get_by_name_start( seq_name, true ).copy
-            #   rescue ArgumentError => e
-            #     Util.fatal_error( PRG_NAME, "error: " + e.to_s )
-            #   end
-            # else
-            #   # Not found, try finding by partial match.
-            #   begin
-            #     seq = current_msa.get_by_name( seq_name, true, true )
-            #   rescue ArgumentError => e
-            #     Util.fatal_error( PRG_NAME, "error: " + e.to_s )
-            #   end
-            # end
-
             normalized_id = per_species_counter.to_s( 16 ).upcase +
              "_" + current_species
 
@@ -552,10 +537,10 @@ module Evoruby
       rescue Exception => e
         Util.fatal_error( PRG_NAME, "error: " + e.to_s )
       end
-      if @seqs <= 10000000
+      if @seqs <= 600000
         @file_to_msa[ input ] = msa
         @seqs += msa.get_number_of_seqs
-        puts "total seqs in memory: " + @seqs.to_str
+        puts "   total seqs in memory: " + @seqs.to_s
       end
       msa
     end