From ea9f1775c8ef8245e54d4b8586525cdd2a5d9cfa Mon Sep 17 00:00:00 2001 From: "cmzmasek@gmail.com" Date: Fri, 18 Jan 2013 23:27:45 +0000 Subject: [PATCH] inprogress --- forester/ruby/evoruby/lib/evo/tool/taxonomy_processor.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/forester/ruby/evoruby/lib/evo/tool/taxonomy_processor.rb b/forester/ruby/evoruby/lib/evo/tool/taxonomy_processor.rb index bd5f6aa..20c5a53 100644 --- a/forester/ruby/evoruby/lib/evo/tool/taxonomy_processor.rb +++ b/forester/ruby/evoruby/lib/evo/tool/taxonomy_processor.rb @@ -222,9 +222,7 @@ module Evoruby elsif SIMPLE new_desc = counter.to_s( 16 ) elsif extract_taxonomy - if ( desc.count( "[" ) != desc.count( "]" ) ) - Util.fatal_error( PRG_NAME, "illegal bracket count in: " + desc ) - end + species = nil species_map.each_key do | key | if desc =~ /[\b|_]#{key}\b/ # Added boundaries to prevent e.g. RAT matching ARATH. @@ -234,7 +232,8 @@ module Evoruby end end if species == nil - if desc =~/.*\[(\S{3,}?)\]/ + #if desc =~/.*\[(\S{3,}?)\]/ + if desc =~/\[([A-Z0-9]{3,6})\]\s*$/ #new species = $1 species.strip! species.upcase! -- 1.7.10.2