update combine results

git-svn-id: file:///srv/svn/function2gene/trunk@12 a0738b58-4706-0410-8799-fb830574a030

diff --git a/bin/combine_results b/bin/combine_results
index 76a4e0c044e47f3080f9949c1ed43cb066576ddc..21b1c9276f32e8995dccb5bc52e9560643cc5cc1 100755 (executable)
--- a/bin/combine_results
+++ b/bin/combine_results
@@ -104,6 +104,7 @@ for my $file_name (@ARGV) {
          $genes{$gene[NAME]}{database}{$gene[DBNAME]}++;
          $genes{$gene[NAME]}{hits}++;
          $genes{$gene[NAME]}{terms}{$gene[KEYWORD]}++;
+         $genes{$gene[NAME]}{terms}{$gene[KEYWORD].'['.$gene[DBNAME].']'}++;
          add_unique_parts($genes{$gene[NAME]},'refseq',$gene[REFSEQ]);
          add_if_better($genes{$gene[NAME]},'description',$gene[DESCRIPTION]);
          add_if_better($genes{$gene[NAME]},'location',$gene[LOCATION]);
@@ -114,7 +115,7 @@ for my $file_name (@ARGV) {
 
 print join(',',map {qq("$_")} @csv_fields),qq(\n);
 for my $gene (keys %genes) {
-     $genes{$gene}{rzscore} = scalar keys %{$genes{$gene}{terms}};
+     $genes{$gene}{rzscore} = scalar grep {$_ !~ /\[/} keys %{$genes{$gene}{terms}};
      next if $genes{$gene}{rzscore} == 1 and exists $genes{$gene}{terms}{antigen};
      $genes{$gene}{rzscore} -= 1 if exists $genes{$gene}{terms}{antigen};
      print STDOUT join (',',