From 4eab078381c4ad1ad2663629f7580eaf852a7c3a Mon Sep 17 00:00:00 2001 From: cmzmasek Date: Mon, 27 Mar 2017 18:08:24 -0700 Subject: [PATCH] in progress... --- forester/ruby/evoruby/lib/evo/tool/taxonomy_processor.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/forester/ruby/evoruby/lib/evo/tool/taxonomy_processor.rb b/forester/ruby/evoruby/lib/evo/tool/taxonomy_processor.rb index b8f2cad..7729d54 100644 --- a/forester/ruby/evoruby/lib/evo/tool/taxonomy_processor.rb +++ b/forester/ruby/evoruby/lib/evo/tool/taxonomy_processor.rb @@ -19,7 +19,7 @@ module Evoruby class TaxonomyProcessor PRG_NAME = "tap" - PRG_DATE = "170214" + PRG_DATE = "170327" PRG_DESC = "Replacement of labels in multiple sequence files" PRG_VERSION = "2.004" WWW = "https://sites.google.com/site/cmzmasek/home/software/forester" @@ -181,10 +181,10 @@ module Evoruby new_desc = nil desc.gsub!( /\s+/, ' ' ) if extract_taxonomy - if desc =~/\s\[(([A-Z9][A-Z]{2}[A-Z0-9]{2})|RAT|PIG|PEA|CAP)\]/ + if desc =~/\s\[([A-Z0-9]{3,5})\]/ new_desc = counter.to_s( 16 ) + "_" + $1 else - Util.fatal_error( PRG_NAME, "could not get taxonomy from: " + desc ) + Util.fatal_error( PRG_NAME, "could not get taxonomy code from \"" + desc + "\"" ) end else new_desc = counter.to_s( 16 ) -- 1.7.10.2