7a0635be123f35cc0b5063af03911a70ecbc9841 angie Fri Jun 1 17:30:41 2012 -0700 Track #7964 (1000 Genomes Phase 1 Variant Calls): adding trackDb entryand code support for database table that has per-chromosome fileNames because 1000 Genomes provides enormous per-chromosome files. This is very similar to code support for per-chromosome BAM. To-do: refactor out bam-specific code and trackDbCustom.c's tdbBigFileName to use bbiNameFromSettingOrTable(Chrom). diff --git src/hg/lib/vcfUi.c src/hg/lib/vcfUi.c index 209dc7c..f9fa729 100644 --- src/hg/lib/vcfUi.c +++ src/hg/lib/vcfUi.c @@ -119,31 +119,31 @@ puts("</TABLE>"); } } //TODO: share this code w/hgTracks, hgc in hg/lib/vcfFile.c static struct vcfFile *vcfHopefullyOpenHeader(struct cart *cart, struct trackDb *tdb) /* Defend against network errors and return the vcfFile object with header data, or NULL. */ { #if (defined USE_TABIX && defined KNETFILE_HOOKS) knetUdcInstall(); if (udcCacheTimeout() < 300) udcSetCacheTimeout(300); #endif//def USE_TABIX && KNETFILE_HOOKS char *db = cartString(cart, "db"); struct sqlConnection *conn = hAllocConnTrack(db, tdb); -char *fileOrUrl = bbiNameFromSettingOrTable(tdb, conn, tdb->table); +char *fileOrUrl = bbiNameFromSettingOrTableChrom(tdb, conn, tdb->table, hDefaultChrom(db)); hFreeConn(&conn); int vcfMaxErr = 100; struct vcfFile *vcff = NULL; /* protect against temporary network error */ struct errCatch *errCatch = errCatchNew(); if (errCatchStart(errCatch)) { vcff = vcfTabixFileMayOpen(fileOrUrl, NULL, 0, 0, vcfMaxErr, -1); } errCatchEnd(errCatch); if (errCatch->gotError) { if (isNotEmpty(errCatch->message->string)) warn("unable to open %s: %s", fileOrUrl, errCatch->message->string); }