8610c522f28515c16aed778408997136448f3c45 max Wed Nov 23 05:15:16 2016 -0800 fixing summary button for bigDataIndex support in table browser, refs #18420 diff --git src/hg/hgTables/bam.c src/hg/hgTables/bam.c index 44d6322..13dd678 100644 --- src/hg/hgTables/bam.c +++ src/hg/hgTables/bam.c @@ -244,31 +244,32 @@ errAbort("cigarWidth: unrecognized CIGAR op %c -- update me", op); } } return tLength; } static void addFilteredBedsOnRegion(char *fileName, struct region *region, char *table, struct asFilter *filter, struct lm *bedLm, struct bed **pBedList, struct hash *idHash, int *pMaxOut) /* Add relevant beds in reverse order to pBedList */ { struct lm *lm = lmInit(0); struct trackDb *tdb = findTdbForTable(database, curTrack, curTable, ctLookupName); char *cacheDir = cfgOption("cramRef"); char *refUrl = trackDbSetting(tdb, "refUrl"); -struct samAlignment *sam, *samList = bamFetchSamAlignmentPlus(fileName, region->chrom, +char *indexUrl = trackDbSetting(tdb, "bigDataIndex"); +struct samAlignment *sam, *samList = bamAndIndexFetchSamAlignmentPlus(fileName, indexUrl, region->chrom, region->start, region->end, lm, refUrl, cacheDir); char *row[SAMALIGNMENT_NUM_COLS]; char numBuf[BAM_NUM_BUF_SIZE]; for (sam = samList; sam != NULL; sam = sam->next) { samAlignmentToRow(sam, numBuf, row); if (asFilterOnRow(filter, row)) { if ((idHash != NULL) && (hashLookup(idHash, sam->qName) == NULL)) continue; struct bed *bed; lmAllocVar(bedLm, bed); bed->chrom = lmCloneString(bedLm, sam->rName); bed->chromStart = sam->pos - 1;