e31cf0a8c121c0d36707912926d4d6f6f80b3708 hiram Fri Jun 3 12:05:39 2022 -0700 now using chromAlias.bb, better mkSymlink progress, no more restriction on dynamicBlat server space and report total track count on verify diff --git src/hg/makeDb/doc/asmHubs/verifyOnDownload.sh src/hg/makeDb/doc/asmHubs/verifyOnDownload.sh index e27901e..defb6e6 100755 --- src/hg/makeDb/doc/asmHubs/verifyOnDownload.sh +++ src/hg/makeDb/doc/asmHubs/verifyOnDownload.sh @@ -15,56 +15,60 @@ # ${toolsDir}/verifyOnDownload.sh $$F < /dev/null; done export host=$1 export orderList=$2 export successCount=0 export doneCount=0 export minTrackCount=12 export dbHost="localhost" export hubSource="hgdownload-test.gi.ucsc.edu" if [ "${host}" = "apibeta.soe.ucsc.edu" ]; then hubSource="hgdownload.soe.ucsc.edu" fi +export totalTrackCount=0 + for dirPath in `~/kent/src/hg/makeDb/doc/asmHubs/mkSendList.pl "${orderList}"` do ((doneCount=doneCount+1)) export genome=`basename $dirPath` case $genome in GC*) trackCount=`curl -L "https://$host/list/tracks?genome=$genome;trackLeavesOnly=1;hubUrl=https://$hubSource/hubs/${dirPath}/hub.txt" \ 2> /dev/null | python -mjson.tool | egrep ": {$" \ | tr -d '"' | sed -e 's/^ \+//; s/ {//;' | xargs echo | wc -w` if [ "${trackCount}" -gt "${minTrackCount}" ]; then ((successCount=successCount+1)) printf "%03d\t%s\t%d tracks:\t" "${doneCount}" "${genome}" "${trackCount}" else printf "%03d\t%s\t%d (error <= %d) tracks:\t" "${doneCount}" "${genome}" "${trackCount}" "${minTrackCount}" fi + totalTrackCount=`echo $totalTrackCount $trackCount | awk '{print $1+$2}'` curl -L "https://$host/list/hubGenomes?hubUrl=https://$hubSource/hubs/${dirPath}/hub.txt" 2> /dev/null \ | python -mjson.tool | egrep "organism\":|description\":" | sed -e "s/'/_/g;" \ | tr -d '"' | xargs echo \ | sed -e 's/genomes: //; s/description: //; s/organism: //; s/{ //g;' ;; *) db=`echo $genome | tr -d '_'` trackCount=`curl -L "https://$host/list/tracks?genome=$db;trackLeavesOnly=1" \ 2> /dev/null | python -mjson.tool | egrep ": {$" \ | egrep -v '"'$db'":' | tr -d '"' \ | sed -e 's/^ \+//; s/ {//;' | xargs echo | wc -w` if [ "${trackCount}" -gt "${minTrackCount}" ]; then ((successCount=successCount+1)) printf "%03d\t%s\t%d tracks:\t" "${doneCount}" "${db}" "${trackCount}" else printf "%03d\t%s\t%d (error < %d) tracks:\t" "${doneCount}" "${db}" "${trackCount}" "${minTrackCount}" fi + totalTrackCount=`echo $totalTrackCount $trackCount | awk '{print $1+$2}'` hgsql -N -e "select organism,description,\",\",scientificName from dbDb where name=\"$db\";" hgcentraltest | tr "'" '_' | xargs echo | sed -e 's/ ,/,/;' ;; esac done export failCount=`echo $doneCount $successCount | awk '{printf "%d", $1-$2}'` -printf "# checked %3d hubs, %3d success, %3d fail\n" "${doneCount}" "${successCount}" "${failCount}" +printf "# checked %3d hubs, %3d success, %3d fail, total tracks: %d\n" "${doneCount}" "${successCount}" "${failCount}" "${totalTrackCount}"