1cf2d7c2d88b736e4d18e1bff47f16c270470ee1 hiram Tue Jan 14 13:19:13 2020 -0800 now have working dataVersion string in the track details page refs #24748 diff --git src/hg/utils/automation/asmHubTrackDb.sh src/hg/utils/automation/asmHubTrackDb.sh index 6c83f35..c3dd414 100755 --- src/hg/utils/automation/asmHubTrackDb.sh +++ src/hg/utils/automation/asmHubTrackDb.sh @@ -365,41 +365,46 @@ $scriptDir/asmHubNcbiGene.pl $asmId $buildDir/html/$asmId.names.tab $buildDir/trackData > $buildDir/html/$asmId.ncbiGene.html haveNcbiGene="yes" fi ################################################################### # ncbiRefSeq composite track if [ -s ${buildDir}/trackData/ncbiRefSeq/$asmId.ncbiRefSeq.bb ]; then rm -f $buildDir/bbi/${asmId}.ncbiRefSeq.bb rm -f $buildDir/ixIxx/${asmId}.ncbiRefSeq.ix rm -f $buildDir/ixIxx/${asmId}.ncbiRefSeq.ixx ln -s ../trackData/ncbiRefSeq/$asmId.ncbiRefSeq.bb $buildDir/bbi/${asmId}.ncbiRefSeq.bb ln -s ../trackData/ncbiRefSeq/$asmId.ncbiRefSeq.ix $buildDir/ixIxx/${asmId}.ncbiRefSeq.ix ln -s ../trackData/ncbiRefSeq/$asmId.ncbiRefSeq.ixx $buildDir/ixIxx/${asmId}.ncbiRefSeq.ixx + export dataVersion="html/ncbiRefSeqVersion.txt" + if [ -s ${buildDir}/trackData/ncbiRefSeq/$asmId.ncbiRefSeqVersion.txt ]; then + dataVersion=`cat ${buildDir}/trackData/ncbiRefSeq/$asmId.ncbiRefSeqVersion.txt` + fi + printf "track refSeqComposite compositeTrack on shortLabel NCBI RefSeq longLabel RefSeq gene predictions from NCBI group genes visibility pack type bigBed dragAndDrop subTracks noInherit on allButtonPair on -dataVersion html/ncbiRefSeqVersion.txt +dataVersion $dataVersion html html/%s.refSeqComposite priority 2 track ncbiRefSeq parent refSeqComposite on color 12,12,120 altColor 120,12,12 shortLabel RefSeq All type bigGenePred searchIndex name searchTrix ixIxx/%s.ncbiRefSeq.ix bigDataUrl bbi/%s.ncbiRefSeq.bb longLabel NCBI RefSeq genes, curated and predicted sets (NM_*, XM_*, NR_*, XR_*, NP_* or YP_*) idXref ncbiRefSeqLink mrnaAcc name baseColorUseCds given @@ -490,30 +495,35 @@ searchIndex name bigDataUrl bbi/%s.bigPsl.bb indelDoubleInsert on indelQueryInsert on showDiffBasesAllScales . showDiffBasesMaxZoom 10000.0 showCdsMaxZoom 10000.0 showCdsAllScales . baseColorDefault diffCodons pslSequence no baseColorUseSequence lfExtra baseColorUseCds table given color 0,0,0\n\n" "${asmId}" fi + if [ -s ${buildDir}/trackData/ncbiRefSeq/$asmId.ncbiRefSeqVersion.txt ]; then + rm -f $buildDir/html/$asmId.ncbiRefSeqVersion.txt + ln -s ../trackData/ncbiRefSeq/$asmId.ncbiRefSeqVersion.txt $buildDir/html/ + fi + $scriptDir/asmHubNcbiRefSeq.pl $asmId $buildDir/html/$asmId.names.tab $buildDir/trackData > $buildDir/html/$asmId.refSeqComposite.html fi # ncbiRefSeq composite track ################################################################### # CpG Islands composite export cpgVis="off" # if there is no unmasked track, then set cpgVis to pack if [ ! -s ${buildDir}/trackData/cpgIslands/unmasked/${asmId}.cpgIslandExtUnmasked.bb ]; then cpgVis="on" fi if [ -s ${buildDir}/trackData/cpgIslands/unmasked/${asmId}.cpgIslandExtUnmasked.bb -o -s ${buildDir}/trackData/cpgIslands/masked/${asmId}.cpgIslandExt.bb ]; then rm -f ${buildDir}/bbi/${asmId}.cpgIslandExtUnmasked.bb ${buildDir}/bbi/${asmId}.cpgIslandExt.bb printf "track cpgIslands