From: cmzmasek@gmail.com <cmzmasek@gmail.com@ca865154-3058-d1c3-3e42-d8f55a55bdbd>
Date: Fri, 28 Sep 2012 02:54:05 +0000 (+0000)
Subject: in progress
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=953c2b0955de421b707cb096804757b6370d7334;p=jalview.git

in progress
---

diff --git a/forester/ruby/evoruby/exe/run_phylo_pipeline.rb b/forester/ruby/evoruby/exe/run_phylo_pipeline.rb
index 5f9358c..163def7 100755
--- a/forester/ruby/evoruby/exe/run_phylo_pipeline.rb
+++ b/forester/ruby/evoruby/exe/run_phylo_pipeline.rb
@@ -23,8 +23,8 @@ module Evoruby
 
     def run
       unless ARGV.length >= 4 && ARGV.length <= 6
-        error "arguments are: <fasta formatted inputfile> <hmm-name> <min-length> +
-        <neg E-value exponent for domain extraction> [E-value for hmmscan, default is 20] [hmmscan option, default is --nobias]"
+        error "arguments are: <fasta formatted inputfile> <hmm-name> <min-length> " +
+         "<neg E-value exponent for domain extraction> [E-value for hmmscan, default is 20] [hmmscan option, default is --nobias]"
       end
 
       input       = ARGV[ 0 ]
@@ -54,19 +54,6 @@ module Evoruby
 
       base_name = get_base_name input
 
-      #base_name = nil
-      #if input.downcase.end_with?( "_ni.fasta" )
-      #  base_name = input[ 0 .. input.length - 10 ]
-      #elsif input.downcase.end_with?( ".fasta" )
-      #  base_name = input[ 0 .. input.length - 7 ]
-      #elsif input.downcase.end_with?( "_ni.fsa" )
-      #  base_name = input[ 0 .. input.length - 8 ]
-      #elsif input.downcase.end_with?( ".fsa" )
-      #  base_name = input[ 0 .. input.length - 5 ]
-      #else
-      #  base_name = input
-      #end
-
       puts "1. hmmscan:"
       cmd = "#{HMMSCAN} #{hmmscan_option} --domtblout #{base_name}_hmmscan_#{e_for_hmmscan.to_s} -E #{e_for_hmmscan.to_s} #{PFAM}Pfam-A.hmm #{input}"
       run_command( cmd )