afeeb82174da7dda62cffcbbf3ffab87194269d6
hiram
Fri Aug 2 15:37:49 2019 -0700
show correct stats for each subTrack in a composite refs #23589
diff --git src/hg/hubApi/hubApi.c src/hg/hubApi/hubApi.c
index 3647be1..af150b5 100644
--- src/hg/hubApi/hubApi.c
+++ src/hg/hubApi/hubApi.c
@@ -477,45 +477,42 @@
hPrintf("
\n");
if (debug)
{
hPrintf(" - subtracks for '%s' db: '%s'
\n", tdb->track, db);
hPrintf(" - chrom: '%s' size: %u
\n", chromName, chromSize);
}
if (tdb->subtracks)
{
struct trackDb *tdbEl = NULL;
for (tdbEl = tdb->subtracks; tdbEl; tdbEl = tdbEl->next)
{
boolean compositeContainer = tdbIsComposite(tdbEl);
boolean compositeView = tdbIsCompositeView(tdbEl);
if (! (compositeContainer || compositeView) )
{
- if (chromSize < 1)
- {
char *bigDataIndex = NULL;
char *relIdxUrl = trackDbSetting(tdbEl, "bigDataIndex");
if (relIdxUrl != NULL)
bigDataIndex = trackHubRelativeUrl(hub->genomeList->trackDbFile, relIdxUrl);
char *bigDataUrl = trackDbSetting(tdbEl, "bigDataUrl");
char *longName = NULL;
unsigned longSize = 0;
struct dyString *errors = newDyString(1024);
(void) bbiBriefMeasure(tdbEl->type, bigDataUrl, bigDataIndex, &chromCount, &itemCount, errors, &longName, &longSize);
chromSize = longSize;
chromName = longName;
}
- }
if (tdbIsCompositeView(tdbEl))
hPrintf("- %s: %s : composite view of parent: %s
\n", tdbEl->track, tdbEl->type, tdbEl->parent->track);
else
{
if (isSupportedType(tdbEl->type))
hubSampleUrl(hub, tdbEl, chromCount, itemCount, genome, errorString);
else
hPrintf("- %s: %s : subtrack of parent: %s
\n", tdbEl->track, tdbEl->type, tdbEl->parent->track);
}
hashCountTrack(tdbEl, countTracks);
if (tdbEl->subtracks)
hubSubTracks(hub, db, tdbEl, countTracks, chromCount, itemCount, chromName, chromSize, genome, errorString);
}
}
hPrintf("
\n");