2248d4012416d220927d54ea0c47295560792625 hiram Mon Sep 12 22:06:58 2022 -0700 now working through gatewayPage although it needs to have URLs for downloads adjusted refs #29811 diff --git src/hg/utils/automation/doAssemblyHub.pl src/hg/utils/automation/doAssemblyHub.pl index 650231e..c663322 100755 --- src/hg/utils/automation/doAssemblyHub.pl +++ src/hg/utils/automation/doAssemblyHub.pl @@ -1055,49 +1055,56 @@ fi exit 0 _EOF_ ); $bossScript->execute(); } # chromAlias ######################################################################### # * step: gatewayPage [workhorse] sub doGatewayPage { my $runDir = "$buildDir/html"; &HgAutomate::mustMkdir($runDir); - my $whatItDoes = "construct html/$asmId.description.html"; + my $whatItDoes = "construct html/$defaultName.description.html"; my $bossScript = newBash HgRemoteScript("$runDir/doGatewayPage.bash", $workhorse, $runDir, $whatItDoes); my $photoJpg = "noPhoto"; my $photoCredit = "noPhoto"; my $photoLink = ""; my $speciesNoBlank = $species; $speciesNoBlank =~ s/ /_/g; +printf STDERR "# looking for photo species: %s\n", ${speciesNoBlank}; if ( -s "$runDir/../photo/$speciesNoBlank.jpg" ) { $photoJpg = "../photo/${speciesNoBlank}.jpg"; $photoCredit = "../photo/photoCredits.txt"; $photoLink = "rm -f ${speciesNoBlank}.jpg; ln -s ../photo/${speciesNoBlank}.jpg ." } else { printf STDERR "# gatewayPage: warning: no photograph available\n"; } +printf STDERR "# asmId: %s\n", $defaultName; +printf STDERR "# asmReport %s\n", $asmReport; +printf STDERR "# chrom.sizes: ../%s.chrom.sizes\n", $defaultName; +printf STDERR "# photoJpg %s\n", $photoJpg; +printf STDERR "# photoCredit %s\n", $photoCredit; + $bossScript->add(<<_EOF_ -export asmId=$asmId +export asmId="$defaultName" export asmReport="$asmReport" \$HOME/kent/src/hg/utils/automation/asmHubGatewayPage.pl \\ \${asmReport} ../\${asmId}.chrom.sizes \\ $photoJpg $photoCredit \\ > \$asmId.description.html 2> \$asmId.names.tab \$HOME/kent/src/hg/utils/automation/genbank/buildStats.pl \\ ../\$asmId.chrom.sizes 2> \$asmId.build.stats.txt $photoLink _EOF_ ); $bossScript->execute(); } # gatewayPage #########################################################################