0564395ec363631f2ff8d295da6f6b50f873fda4 braney Mon Jan 24 17:01:53 2022 -0800 more chromAlias work: some name changes and support for the new genark chromAlias format diff --git src/hg/hgc/lrgClick.c src/hg/hgc/lrgClick.c index 38848f4..50d0c42 100644 --- src/hg/hgc/lrgClick.c +++ src/hg/hgc/lrgClick.c @@ -63,31 +63,31 @@ conn = hAllocConnTrack(database, tdb); char *fileName = bbiNameFromSettingOrTable(tdb, conn, tdb->table); hFreeConn(&conn); if (isEmpty(fileName)) { errAbort("doLrg: missing bigBed fileName for track '%s'", tdb->track); } genericHeader(tdb, item); // Get column urls from trackDb: char *urlsStr = trackDbSetting(tdb, "urls"); struct hash *columnUrls = hashFromString(urlsStr); // Open BigWig file and get interval list. -struct bbiFile *bbi = bigBedFileOpenAlias(fileName, chromAliasGetHash(database)); +struct bbiFile *bbi = bigBedFileOpenAlias(fileName, chromAliasChromToAliasHash(database)); int bedSize = bbi->definedFieldCount; int fieldCount = bbi->fieldCount; struct lm *lm = lmInit(0); struct bigBedInterval *bbList = bigBedIntervalQuery(bbi, chrom, start, end, 0, lm); boolean found = FALSE; struct bigBedInterval *bb; for (bb = bbList; bb != NULL; bb = bb->next) { if (!(bb->start == start && bb->end == end)) continue; char *fields[fieldCount]; char startBuf[16], endBuf[16]; int bbFieldCount = bigBedIntervalToRow(bb, chrom, startBuf, endBuf, fields, fieldCount); if (bbFieldCount != fieldCount) errAbort("doLrg: inconsistent fieldCount (bbi has %d, row has %d)",