cb03e83746d7ddcbde7aea929200614aef571df9 kent Mon Mar 19 17:02:12 2012 -0700 Fixes bug #7222 - where required some track name to have the table name for the summary stats to work in the table browser. diff --git src/hg/hgTables/bigWig.c src/hg/hgTables/bigWig.c index 737540b..c5ebb50 100644 --- src/hg/hgTables/bigWig.c +++ src/hg/hgTables/bigWig.c @@ -44,38 +44,31 @@ } else if (isHubTrack(table)) { struct trackDb *tdb = hashFindVal(fullTrackAndSubtrackHash, table); assert(tdb != NULL); fileName = cloneString(trackDbSetting(tdb, "bigDataUrl")); assert(fileName != NULL); } return fileName; } char *bigWigFileName(char *table, struct sqlConnection *conn) /* Return file name associated with bigWig. This handles differences whether it's * a custom or built-in track. Do a freeMem on returned string when done. */ { -struct trackDb *tdb = NULL; -if (isCustomTrack(table)) // Why isn't custom track in fullTrackAndSubtrackHash? - { - struct customTrack *ct = ctLookupName(table); - tdb = ct->tdb; - } -else - tdb = hashMustFindVal(fullTrackAndSubtrackHash, table); +struct trackDb *tdb = findTdbForTable(database, curTrack, table, ctLookupName); return tdbBigFileName(conn, tdb); } struct bbiInterval *intersectedFilteredBbiIntervalsOnRegion(struct sqlConnection *conn, struct bbiFile *bwf, struct region *region, enum wigCompare filterCmp, double filterLl, double filterUl, struct lm *lm) /* Get list of bbiIntervals (more-or-less bedGraph things from bigWig) out of bigWig file * and if necessary apply filter and intersection. Return list which is allocated in lm. */ { char *chrom = region->chrom; int chromSize = hChromSize(database, chrom); struct bbiInterval *iv, *ivList = bigWigIntervalQuery(bwf, chrom, region->start, region->end, lm); /* Run filter if necessary */ if (filterCmp != wigNoOp_e)