ebc84c82794070f9999daf3bf8c5de7f407d5818 angie Fri Dec 2 15:35:06 2011 -0800 Feature #3707 (VCF+tabix support in hgTables): Brooke reported out-of-memconditions in notes 11 & 12. Fix: add an optional threshold on the number of records to retrieve in vcfTabixFileMayOpen. diff --git src/hg/lib/vcfUi.c src/hg/lib/vcfUi.c index 8f27f8a..3a5985b 100644 --- src/hg/lib/vcfUi.c +++ src/hg/lib/vcfUi.c @@ -127,31 +127,31 @@ #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); 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); + 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); } errCatchFree(&errCatch); return vcff; } static void vcfCfgHapClusterEnable(struct cart *cart, struct trackDb *tdb, char *name, boolean compositeLevel) /* Let the user enable/disable haplotype sorting display. */ {