d5cbd45d0d3db423db2dbad15c653961c0bd29ac hiram Wed Feb 27 13:57:14 2019 -0800 one stop shopping for trackDb now in obtainTdb() function refs #18869 diff --git src/hg/hubApi/getData.c src/hg/hubApi/getData.c index 65bd421..7412482 100644 --- src/hg/hubApi/getData.c +++ src/hg/hubApi/getData.c @@ -153,31 +153,31 @@ if (isEmpty(genome)) apiErrAbort("missing genome= for endpoint '/getdata/track' given hubUrl='%s'", hubUrl); if (isEmpty(track)) apiErrAbort("missing track= for endpoint '/getdata/track' given hubUrl='%s'", hubUrl); struct trackHub *hub = errCatchTrackHubOpen(hubUrl); struct trackHubGenome *hubGenome = NULL; for (hubGenome = hub->genomeList; hubGenome; hubGenome = hubGenome->next) { if (sameString(genome, hubGenome->name)) break; } if (NULL == hubGenome) apiErrAbort("failed to find specified genome=%s for endpoint '/getdata/track' given hubUrl '%s'", genome, hubUrl); -struct trackDb *tdb = trackHubTracksForGenome(hubGenome->trackHub, hubGenome); +struct trackDb *tdb = obtainTdb(hubGenome, NULL); if (NULL == tdb) apiErrAbort("failed to find a track hub definition in genome=%s for endpoint '/getdata/track' given hubUrl='%s'", genome, hubUrl); struct trackDb *thisTrack = NULL; for (thisTrack = tdb; thisTrack; thisTrack = thisTrack->next) { if (sameWord(thisTrack->track, track)) break; } if (NULL == thisTrack) apiErrAbort("failed to find specified track=%s in genome=%s for endpoint '/getdata/track' given hubUrl='%s'", track, genome, hubUrl); char *bigDataUrl = trackDbSetting(thisTrack, "bigDataUrl"); struct bbiFile *bbi = bigFileOpen(thisTrack->type, bigDataUrl);