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 =~ /^\./;
$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;