X-Git-Url: https://git.donarmstrong.com/?p=function2gene.git;a=blobdiff_plain;f=bin%2Fparse_genecard_results;h=fbd98851a4a8d27f88cb7e9eee567b4ebda35643;hp=b42371957a229b4423cd8b89ac152eb2094f7134;hb=af4fd770f221db1cec02393df378e079c0b9a8fc;hpb=6d24067f20698257dc1103d5c21e8a7f6a32b97b

diff --git a/bin/parse_genecard_results b/bin/parse_genecard_results
index b423719..fbd9885 100755
--- a/bin/parse_genecard_results
+++ b/bin/parse_genecard_results
@@ -118,6 +118,8 @@ my $dir = new IO::Dir $options{dir} or die "Unable to open dir $options{dir}: $!
 
 print join(",", map {qq("$_");} qw(Name RefSeq Location Alias Function Description Keyword DBName Filename)),qq(\n);
 
+my ($keyword) = $options{keyword} || $options{dir} =~ m#(?:^|/)([^\/]+)_results_genecard#;
+
 while ($_ = $dir->read) {
      my $file_name = $_;
      next if $file_name =~ /^\./;
@@ -167,9 +169,9 @@ while ($_ = $dir->read) {
      $results[FUNCTION] ||= 'NO FUNCTION';
 
      # Figure out the keyword used
-     ($results[KEYWORD]) = $file_name =~ /search=([^&]+)/;
+     ($results[KEYWORD]) = $file_name =~ /search=?([^&]+)$/;
 
-     $results[KEYWORD] ||= 'NO KEYWORD';
+     $results[KEYWORD] ||= $keyword || 'NO KEYWORD';
 
      # Swiss prot functions
      my @description = (map {s/<[^>]+>/ /g;