21aba8d4cab3ea657db59d4f362c4331158cd86c angie Thu Apr 23 11:51:28 2015 -0700 Apply some band-aids to fix broken filterFields for bigDataUrl-only bigBed tracks. There are still way too many places in hgTables code that use isXyzTable(table, conn) even when tdb is available. I think all those places need to be fixed to pass in tdb if they have it, or NULL if they don't. The type-testers should use tdb if possible, and fall back to using table & conn if tdb is NULL. refs #14379, #15059 diff --git src/hg/hgTables/hgTables.h src/hg/hgTables/hgTables.h index 37c344a..1c1f69e 100644 --- src/hg/hgTables/hgTables.h +++ src/hg/hgTables/hgTables.h @@ -749,31 +749,31 @@ /* ----------- BigBed business in bigBed.c -------------------- */ boolean isBigBed(char *database, char *table, struct trackDb *parent, struct customTrack *(*ctLookupName)(char *table)); /* Local test to see if something is big bed. Handles hub tracks unlike hIsBigBed. */ char *bigBedFileName(char *table, struct sqlConnection *conn); /* Return file name associated with bigBed. This handles differences whether it's * a custom or built-in track or hub. Do a freeMem on returned string when done. */ struct hTableInfo *bigBedToHti(char *table, struct sqlConnection *conn); /* Get fields of bigBed into hti structure. */ struct slName *bigBedGetFields(char *table, struct sqlConnection *conn); /* Get fields of bigBed as simple name list. */ -struct sqlFieldType *bigBedListFieldsAndTypes(char *table, struct sqlConnection *conn); +struct sqlFieldType *bigBedListFieldsAndTypes(struct trackDb *tdb, struct sqlConnection *conn); /* Get fields of bigBed as list of sqlFieldType. */ struct bed *bigBedGetFilteredBedsOnRegions(struct sqlConnection *conn, char *db, char *table, struct region *regionList, struct lm *lm, int *retFieldCount); /* Get list of beds from bigBed, in all regions, that pass filtering. */ void bigBedTabOut(char *db, char *table, struct sqlConnection *conn, char *fields, FILE *f); /* Print out selected fields from Big Bed. If fields is NULL, then print out all fields. */ struct slName *randomBigBedIds(char *table, struct sqlConnection *conn, int count); /* Return some arbitrary IDs from a bigBed file. */ void showSchemaBigBed(char *table, struct trackDb *tdb); /* Show schema on bigBed. */