cdd0101336b3399e8d1a204a298b017a2675cc3a hiram Fri Jan 24 10:35:41 2020 -0800 now correctly using this asmHubs directories as toolsDir to obtain commonName listings refs #24748 diff --git src/hg/makeDb/doc/asmHubs/mkGenomes.pl src/hg/makeDb/doc/asmHubs/mkGenomes.pl index 86c6b3e..24e7693 100755 --- src/hg/makeDb/doc/asmHubs/mkGenomes.pl +++ src/hg/makeDb/doc/asmHubs/mkGenomes.pl @@ -7,48 +7,47 @@ my $argc = scalar(@ARGV); if ($argc != 2) { printf STDERR "mkGenomes.pl Name asmName\n"; printf STDERR "e.g.: mkAsmStats Mammals mammals\n"; exit 255; } my $Name = shift; my $asmHubName = shift; my %betterName; # key is asmId, value is common name my $srcDocDir = "${asmHubName}AsmHub"; my $buildDir = "/hive/data/genomes/asmHubs/refseqBuild"; my $destDir = "/hive/data/genomes/asmHubs/$asmHubName"; my $home = $ENV{'HOME'}; -my $srcDir = "$home/kent/src/hg/makeDb/doc/$srcDocDir"; +my $toolsDir = "$home/kent/src/hg/makeDb/doc/asmHubs"; my $commonNameList = "$asmHubName.asmId.commonName.tsv"; my $commonNameOrder = "$asmHubName.commonName.asmId.orderList.tsv"; - -open (FH, "<$srcDir/${commonNameList}") or die "can not read $srcDir/${commonNameList}"; +open (FH, "<$toolsDir/${commonNameList}") or die "can not read $toolsDir/${commonNameList}"; while (my $line = <FH>) { chomp $line; my ($asmId, $name) = split('\t', $line); $betterName{$asmId} = $name; } close (FH); my @orderList; # asmId of the assemblies in order from the *.list files # the order to read the different .list files: my $assemblyCount = 0; -open (FH, "<$srcDir/${commonNameOrder}") or die "can not read ${commonNameOrder}"; +open (FH, "<$toolsDir/${commonNameOrder}") or die "can not read ${commonNameOrder}"; while (my $line = <FH>) { chomp $line; my ($commonName, $asmId) = split('\t', $line); push @orderList, $asmId; ++$assemblyCount; } close (FH); my $orderKey = 1; foreach my $asmId (reverse(@orderList)) { my $buildDir = "/hive/data/genomes/asmHubs/refseqBuild/" . substr($asmId, 0 ,3); $buildDir .= "/" . substr($asmId, 4 ,3); $buildDir .= "/" . substr($asmId, 7 ,3); $buildDir .= "/" . substr($asmId, 10 ,3); $buildDir .= "/" . $asmId;