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/hgc/vcfClick.c src/hg/hgc/vcfClick.c index 9436cf1..8a8eb68 100644 --- src/hg/hgc/vcfClick.c +++ src/hg/hgc/vcfClick.c @@ -288,31 +288,31 @@ puts("</TABLE>"); } void doVcfTabixDetails(struct trackDb *tdb, char *item) /* Show details of an alignment from a VCF file compressed and indexed by tabix. */ { #if (defined USE_TABIX && defined KNETFILE_HOOKS) knetUdcInstall(); if (udcCacheTimeout() < 300) udcSetCacheTimeout(300); #endif//def USE_TABIX && KNETFILE_HOOKS int start = cartInt(cart, "o"); int end = cartInt(cart, "t"); struct sqlConnection *conn = hAllocConnTrack(database, tdb); // TODO: will need to handle per-chrom files like bam, maybe fold bamFileNameFromTable into this:: -char *fileOrUrl = bbiNameFromSettingOrTable(tdb, conn, tdb->table); +char *fileOrUrl = bbiNameFromSettingOrTableChrom(tdb, conn, tdb->table, seqName); hFreeConn(&conn); int vcfMaxErr = -1; struct vcfFile *vcff = NULL; /* protect against temporary network error */ struct errCatch *errCatch = errCatchNew(); if (errCatchStart(errCatch)) { vcff = vcfTabixFileMayOpen(fileOrUrl, seqName, start, end, vcfMaxErr, -1); } errCatchEnd(errCatch); if (errCatch->gotError) { if (isNotEmpty(errCatch->message->string)) warn("%s", errCatch->message->string); }