1bdadb48130fa7683c5c0dc8be327f04feac0bea braney Wed Jan 17 12:46:21 2018 -0800 fix a few places where VCF and bigBarChart wasn't working on assembly hubs diff --git src/hg/lib/hdb.c src/hg/lib/hdb.c index a181aa1..4206104 100644 --- src/hg/lib/hdb.c +++ src/hg/lib/hdb.c @@ -5520,31 +5520,31 @@ } char *rewrittenFname = hReplaceGbdb(fileName); freez(&fileName); return rewrittenFname; } char *bbiNameFromSettingOrTableChrom(struct trackDb *tdb, struct sqlConnection *conn, char *table, char *seqName) /* Return file name from bigDataUrl or little table that might have a seqName column. * If table does have a seqName column, return NULL if there is no file for seqName. */ { char *fileName = hReplaceGbdb(trackDbSetting(tdb, "bigDataUrl")); if (fileName == NULL) fileName = hReplaceGbdb(trackDbSetting(tdb, "bigGeneDataUrl")); -if (fileName == NULL) +if ((fileName == NULL) && (conn != NULL)) fileName = bbiNameFromTableChrom(conn, table, seqName); return fileName; } char *bbiNameFromSettingOrTable(struct trackDb *tdb, struct sqlConnection *conn, char *table) /* Return file name from bigDataUrl or little table. */ { return bbiNameFromSettingOrTableChrom(tdb, conn, table, NULL); } static struct slName *hListSnpNNNTables(struct sqlConnection *conn, char *suffix) /* Return a list of 'snpNNN<suffix>' tables, if any, in reverse 'SHOW TABLES' order * (highest first). If there are none and suffix is NULL/empty but conn has a table 'snp', * return that as a fallback for older databases like hg16. * suffix may be NULL to get the 'All SNPs' table (as opposed to Common, Flagged, Mult). */