d8db31ce919ec130b1f732ea979e1ea093b8af5d hiram Mon Apr 22 15:13:49 2024 -0700 manage flies common name correctly no redmine diff --git src/hg/makeDb/doc/asmHubs/commonNames.pl src/hg/makeDb/doc/asmHubs/commonNames.pl index dc8dc0f..f2fc9d7 100755 --- src/hg/makeDb/doc/asmHubs/commonNames.pl +++ src/hg/makeDb/doc/asmHubs/commonNames.pl @@ -96,43 +96,45 @@ $extraStrings = "$asmType $yearDate"; $extraStrings =~ s/^ +//; } my $orgName = `grep -i -m 1 "Organism name:" "${asmRpt}" | tr -d " "`; $orgName =~ s/.*\(//; $orgName =~ s/\)//g; $orgName =~ s/\(//g; $orgName =~ s/\[//g; $orgName =~ s/\]//g; $orgName =~ s/\?/ /g; $orgName =~ s/\+//g; $orgName =~ s/\*//g; chomp $orgName; if ($orgName =~ m/kinetoplastids|firmicutes|proteobacteria|high G|enterobacteria|agent of/) { $orgName = $sciName; - } elsif ($orgName =~ m/bugs|crustaceans|nematodes|flatworm|ascomycete|basidiomycete|budding|microsporidian|smut|fungi|eukaryotes/) { + } elsif ($orgName =~ m/bugs|crustaceans|nematodes|flatworm|ascomycete|basidiomycete|budding|microsporidian|smut|fungi|eukaryotes|flies/) { my ($order, undef) = split('\s', $orgName, 2); $order = "budding yeast" if ($order =~ m/budding/); $order = "smut fungi" if ($order =~ m/smut/); $order = "ascomycetes" if ($order =~ m/ascomycete/); $order = "crustacean" if ($order =~ m/crustaceans/); $order = "flatworm" if ($order =~ m/flatworms/); $order = "nematode" if ($order =~ m/nematodes/); $order = "basidiomycetes" if ($order =~ m/basidiomycete/); my @a = split('\s+', $sciName); my $lastN = scalar(@a) - 1; if ($orgName =~ m/eukaryotes/) { $orgName = uc(substr($a[0], 0, 1)) . "." . "@a[1..$lastN]"; + } elsif ($orgName =~ m/flies/) { + $orgName = "fly " . uc(substr($a[0], 0, 1)) . "." . "@a[1..$lastN]"; } else { $orgName = "$order " . uc(substr($a[0], 0, 1)) . "." . "@a[1..$lastN]"; } } elsif ($orgName eq "viruses") { $orgName = `grep -i -m 1 "Organism name:" "${asmRpt}" | tr -d " "`; chomp $orgName; $orgName =~ s/.*ism name:\s+//i; $orgName =~ s/\s+\(.*\)$//; } if (length($extraStrings)) { $extraStrings =~ s/\(//g; $extraStrings =~ s/\)//g; $extraStrings =~ s/\[//g; $extraStrings =~ s/\]//g; $extraStrings =~ s/\?/ /g;