e56fcf51cffe72602edd211ab12d1dbb74e04c1c kent Fri Jan 7 15:43:54 2011 -0800 Fixing bug where bogus NULL would be returned for bbiFileName. diff --git src/hg/hgTracks/bigBedTrack.c src/hg/hgTracks/bigBedTrack.c index 3cdb8c2..331d6fb 100644 --- src/hg/hgTracks/bigBedTrack.c +++ src/hg/hgTracks/bigBedTrack.c @@ -13,31 +13,32 @@ #include "localmem.h" #include "wigCommon.h" #include "bbiFile.h" #include "obscure.h" #include "bigWig.h" #include "bigBed.h" char *bbiNameFromSettingOrTable(struct trackDb *tdb, struct sqlConnection *conn, char *table) /* Return file name from little table. */ { char *fileName = cloneString(trackDbSetting(tdb, "bigDataUrl")); if (fileName == NULL) { char query[256]; safef(query, sizeof(query), "select fileName from %s", table); - char *fileName = sqlQuickString(conn, query); + fileName = sqlQuickString(conn, query); + uglyf("query=%s, fileName=%s
\n", query, fileName); if (fileName == NULL) errAbort("Missing fileName in %s table", table); } return fileName; } static struct bbiFile *fetchBbiForTrack(struct track *track) /* Fetch bbiFile from track, opening it if it is not already open. */ { struct bbiFile *bbi = track->bbiFile; if (bbi == NULL) { struct sqlConnection *conn = hAllocConnTrack(database, track->tdb); char *fileName = bbiNameFromSettingOrTable(track->tdb, conn, track->table); hFreeConn(&conn);