X-Git-Url: https://git.donarmstrong.com/?p=function2gene.git;a=blobdiff_plain;f=bin%2Ffunction2gene;h=a89207267a9d19473d37fa243f9feacc211e5905;hp=de4915bc4f95ecbdd9c564ffb7de88938658d4c0;hb=63fb26c8c37a0ea5af1cfc32efaad55d4c32b596;hpb=af4fd770f221db1cec02393df378e079c0b9a8fc

diff --git a/bin/function2gene b/bin/function2gene
index de4915b..a892072 100755
--- a/bin/function2gene
+++ b/bin/function2gene
@@ -130,7 +130,7 @@ $ERRORS.="restart-at must be one of get, parse or combine\n" if
 
 $ERRORS.="unknown database(s)" if
      @{$options{databases}} and
-     grep {$_ !~ /^(?:ncbi|genecard|harvester)$/i} @{$options{databases}};
+     grep {$_ !~ /^(?:ncbi|genecard|harvester|ensembl)$/i} @{$options{databases}};
 
 if (not length $options{results}) {
      $ERRORS.="results directory not specified";
@@ -142,7 +142,7 @@ elsif (not -d $options{results} or not -w $options{results}) {
 pod2usage($ERRORS) if length $ERRORS;
 
 if (not @{$options{databases}}) {
-     $options{databases} = [qw(ncbi genecard harvester)]
+     $options{databases} = [qw(ncbi genecard harvester ensembl)]
 }
 
 $DEBUG = $options{debug};
@@ -192,6 +192,7 @@ if (@{$options{keywords}}) {
 	       next if /^\s*[#;]/;
 	       next unless /\w+/;
 	       chomp;
+	       s/\r$//;
 	       my ($keyword,$weight) = split /\t/, $_;
 	       $weight = 1 if not defined $weight;
 	       $state{keyword_weight}{$keyword} = $weight;