d4266bc9322e38cdfb07859ab4db8e2671abb4e7 chmalee Thu Sep 10 12:44:07 2020 -0700 Change missing track description page message to indicate it is just a warning, and make all track warnings print if there are no other errors present, refs #13428 diff --git src/hg/utils/hubCheck/hubCheck.c src/hg/utils/hubCheck/hubCheck.c index a17bc41..234e995 100644 --- src/hg/utils/hubCheck/hubCheck.c +++ src/hg/utils/hubCheck/hubCheck.c @@ -782,42 +782,39 @@ } if (errCatchStart(errCatch)) { hubCheckParentsAndChildren(tdb); if (trackIsContainer) retVal |= hubCheckCompositeSettings(genome, tdb, errors, options); if (tdbIsSubtrack(tdb)) retVal |= hubCheckSubtrackSettings(genome, tdb, errors, options); if (options->checkFiles) hubCheckBigDataUrl(hub, genome, tdb); trackHubAddDescription(genome->trackDbFile, tdb); if (!tdb->html) - warn("missing description page for track: '%s'", tdb->track); + warn("warning: missing description page for track: '%s'", tdb->track); } errCatchEnd(errCatch); -if (errCatch->gotError) +if (errCatch->gotError || errCatch->gotWarning) { - trackDbErrorCount += 1; retVal = 1; trackDbErr(errors, errCatch->message->string, genome, tdb, options->htmlOut); - } -if (errCatch->gotWarning) - { - trackDbErr(errors, errCatch->message->string, genome, tdb, options->htmlOut); + if (errCatch->gotError) + trackDbErrorCount += 1; } errCatchFree(&errCatch); if (options->htmlOut) { if (trackIsContainer) { for (tempTdb = tdb->subtracks; tempTdb != NULL; tempTdb = tempTdb->next) { char subtrackName[512]; safef(subtrackName, sizeof(subtrackName), "%s_%s", trackHubSkipHubName(genome->name), trackHubSkipHubName(tempTdb->track)); textName = trackHubSkipHubName(tempTdb->longLabel); dyStringPrintf(errors, "%s,", makeFolderObjectString(subtrackName, textName, idName, "TRACK", TRUE, retVal)); } }