192b2ae780feed3f18c415c42c1de1dbf7bf5be9 hiram Fri Aug 2 21:48:00 2019 -0700 now with gateway page images refs #23734 diff --git src/hg/utils/automation/doAssemblyHub.pl src/hg/utils/automation/doAssemblyHub.pl index 5b64ed1..2aab979 100755 --- src/hg/utils/automation/doAssemblyHub.pl +++ src/hg/utils/automation/doAssemblyHub.pl @@ -691,55 +691,50 @@ } # assemblyGap ######################################################################### # * step: gatewayPage [workhorse] sub doGatewayPage { my $runDir = "$buildDir/html"; &HgAutomate::mustMkdir($runDir); my $whatItDoes = "construct html/$asmId.description.html"; my $bossScript = newBash HgRemoteScript("$runDir/doGatewayPage.bash", $workhorse, $runDir, $whatItDoes); my $photoJpg = "noPhoto"; my $photoCredit = "noPhoto"; my $photoLink = ""; - if ( -s "$runDir/photo/$species.jpg" ) { + if ( -s "$runDir/../photo/$species.jpg" ) { $photoJpg = "../photo/\${species}.jpg"; $photoCredit = "../photo/photoCredits.txt"; - $photoLink = "ln -s ../photo/\${species}.jpg ." + $photoLink = "rm -f \${species}.jpg; ln -s ../photo/\${species}.jpg ." } else { printf STDERR "# gatewayPage: warning: no photograph available\n"; } $bossScript->add(<<_EOF_ export asmId=$asmId export species=$species -if [ ../download/\${asmId}_assembly_report.txt -nt \$asmId.description.html ]; then \$HOME/kent/src/hg/utils/automation/asmHubGatewayPage.pl \\ ../download/\${asmId}_assembly_report.txt ../\${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 touch -r ../download/\${asmId}_assembly_report.txt \$asmId.description.html $photoLink -else - printf "# gatewayPage step previously completed\\n" 1>&2 - exit 0 -fi _EOF_ ); $bossScript->execute(); } # gatewayPage ######################################################################### # * step: cytoBand [workhorse] sub doCytoBand { my $runDir = "$buildDir/trackData/cytoBand"; &HgAutomate::mustMkdir($runDir); my $whatItDoes = "construct cytoBand track and navigation ideogram"; my $bossScript = newBash HgRemoteScript("$runDir/doCytoBand.bash", $workhorse, $runDir, $whatItDoes);