1c208beb06fed20869c546a09a0ca2b8999b4bee chmalee Wed Apr 17 16:46:31 2019 -0700 Taking bigDataUrl check out of hubCheck and into the trackHub lib so hgHubConnect can use it, refs #18870, #13428 diff --git src/hg/hgHubConnect/hgHubConnect.c src/hg/hgHubConnect/hgHubConnect.c index 37ed605..842be4d 100644 --- src/hg/hgHubConnect/hgHubConnect.c +++ src/hg/hgHubConnect/hgHubConnect.c @@ -375,40 +375,52 @@ ourPrintCell(""); puts("</tr>"); } printf("</tbody></TABLE>\n"); printf("</div>"); } int doCheckTrackDb(struct dyString *errors, struct trackHub *hub, struct trackHubGenome *genome) /* Attempt to open a trackDb from a hub and report errors back. * Eventually will check every stanza and not die if there's an error with the first one*/ { int errorCount = 0; -struct trackDb *tdb = NULL; +struct trackDb *tdb = NULL, *tdbList = NULL; struct errCatch *errCatch = errCatchNew(); +struct errCatch *trackFileCatch = errCatchNew(); if (errCatchStart(errCatch)) { - tdb = trackHubTracksForGenome(hub, genome); - tdb = trackDbLinkUpGenerations(tdb); - tdb = trackDbPolishAfterLinkup(tdb, genome->name); + tdbList = trackHubTracksForGenome(hub, genome); + for (tdb = tdbList; tdb != NULL; tdb = tdb->next) + { + dyStringPrintf(errors, "<ul>\n<li>track name: %s\n", tdb->track); + if (errCatchStart(trackFileCatch)) + hubCheckBigDataUrl(hub, genome, tdb); + errCatchEnd(trackFileCatch); + if (trackFileCatch->gotError) + { + errorCount += 1; + dyStringPrintf(errors, "<ul>\n<li><span class=\"hubError\"><b>bigDataUrl error</b>: %s</span></li></ul></ul>\n", trackFileCatch->message->string); + dyStringClear(trackFileCatch->message); + } + } + errCatchFree(&trackFileCatch); if (tdb != NULL) { - dyStringPrintf(errors, "<ul>\n<li>%s</li>\n", tdb->track); dyStringPrintf(errors, "<ul>\n<li>No errors found</li>\n</ul></ul>"); } } errCatchEnd(errCatch); if (errCatch->gotError) { errorCount += 1; dyStringPrintf(errors, "<ul><li><span class=\"hubError\">Error: %s</span></li></ul>\n", errCatch->message->string); } errCatchFree(&errCatch); return errorCount; } int doCheckGenomesFile(struct dyString *errors, struct trackHub *hub)