217c8a80da9dfabfda95956e5b9b40435f0a9a79 kent Thu Jan 13 19:56:32 2011 -0800 Making hub work with table browser. diff --git src/hg/hgTables/bigWig.c src/hg/hgTables/bigWig.c index b22bd4a..24e75d4 100644 --- src/hg/hgTables/bigWig.c +++ src/hg/hgTables/bigWig.c @@ -16,51 +16,51 @@ #include "wiggle.h" #include "hmmstats.h" #include "correlate.h" #include "bbiFile.h" #include "bigWig.h" #include "hubConnect.h" #include "hgTables.h" static char const rcsid[] = "$Id: bigWig.c,v 1.7 2010/06/03 18:53:59 kent Exp $"; boolean isBigWigTable(char *table) /* Return TRUE if table corresponds to a bigWig file. */ { if (isHubTrack(table)) { - struct trackDb *tdb = hashFindVal(fullTrackHash, table); + struct trackDb *tdb = hashFindVal(fullTrackAndSubtrackHash, table); return startsWithWord("bigWig", tdb->type); } else return trackIsType(database, table, curTrack, "bigWig", ctLookupName); } 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. */ { char *fileName = NULL; if (isCustomTrack(table)) { struct customTrack *ct = ctLookupName(table); if (ct != NULL) fileName = cloneString(trackDbSetting(ct->tdb, "bigDataUrl")); } else if (isHubTrack(table)) { - struct trackDb *tdb = hashFindVal(fullTrackHash, table); + struct trackDb *tdb = hashFindVal(fullTrackAndSubtrackHash, table); assert(tdb != NULL); fileName = trackDbSetting(tdb, "bigDataUrl"); assert(fileName != NULL); } else { char query[256]; safef(query, sizeof(query), "select fileName from %s", table); fileName = sqlQuickString(conn, query); } return fileName; } struct bbiInterval *intersectedFilteredBbiIntervalsOnRegion(struct sqlConnection *conn, struct bbiFile *bwf, struct region *region, enum wigCompare filterCmp, double filterLl,