75b500852022f0319cd075ab6d273889ab0b83ef braney Wed Feb 3 14:51:35 2016 -0800 tweak the linefile tabix code to assume .tbi indices. diff --git src/lib/linefile.c src/lib/linefile.c index 2f104b7..b53741e 100644 --- src/lib/linefile.c +++ src/lib/linefile.c @@ -226,31 +226,31 @@ { #ifdef USE_TABIX if (fileOrUrl == NULL) errAbort("lineFileTabixMayOpen: fileOrUrl is NULL"); int tbiNameSize = strlen(fileOrUrl) + strlen(".tbi") + 1; char tbiName[tbiNameSize]; safef(tbiName, sizeof(tbiName), "%s.tbi", fileOrUrl); #ifdef USE_HTS htsFile *htsFile = hts_open(fileOrUrl, "r"); if (htsFile == NULL) { warn("Unable to open \"%s\"", fileOrUrl); return NULL; } tbx_t *tabix; -if ((tabix = ti_index_load(tbiName)) == NULL) +if ((tabix = tbx_index_load2(fileOrUrl, tbiName)) == NULL) #else tabix_t *tabix = ti_open(fileOrUrl, tbiName); if (tabix == NULL) { warn("Unable to open \"%s\"", fileOrUrl); return NULL; } if ((tabix->idx = ti_index_load(tbiName)) == NULL) #endif { warn("Unable to load tabix index from \"%s\"", tbiName); if (tabix) ti_close(tabix); tabix = NULL; return NULL;