0cd872eeea3e1ff8803ab229673324249332418b max Tue Feb 18 20:04:22 2014 -0800 Matt luckily immediately found the bug in previous commit, refs #11957 diff --git src/hg/lib/trackDbCustom.c src/hg/lib/trackDbCustom.c index 72a2a27..bf8ed5e 100644 --- src/hg/lib/trackDbCustom.c +++ src/hg/lib/trackDbCustom.c @@ -1265,34 +1265,36 @@ } void tdbExtrasMembershipSet(struct trackDb *tdb,struct _membership *membership) // Sets the subtrack membership for later retrieval. { tdbExtrasGet(tdb)->membership = membership; } char *tdbBigFileName(struct sqlConnection *conn, struct trackDb *tdb) // Return file name associated with bigWig. Do a freeMem on returned string when done. { char *ret; char *fileName = trackDbSetting(tdb, "bigDataUrl"); // always takes precedence if (fileName != NULL) ret = cloneString(fileName); - +else + { char query[256]; sqlSafef(query, sizeof(query), "select fileName from %s", tdb->table); ret = sqlQuickString(conn, query); + } // replace /gbdb if needed char *rewriteRet = hReplaceGbdb(ret); freeMem(ret); return rewriteRet; } static void rTdbTreeAllowPack(struct trackDb *tdb) // Force this tdb and all children to allow pack/squish { tdb->canPack = TRUE; struct trackDb *childTdb = tdb->subtracks; for ( ;childTdb!=NULL;childTdb=childTdb->next) rTdbTreeAllowPack(childTdb); }