e9ed25747e3d8ab10963306b826f7cedc5e71897 Merge parents b18f2f9facb 992aeef92fe braney Mon Sep 7 11:35:30 2026 -0700 Merge branch 'quickLiftAlign38249' -- alignment tracks in quickLift, refs #38249 # Conflicts: # src/hg/lib/trackHub.c diff --cc src/hg/lib/trackHub.c index 42613d4d88f,7daa2c8f8a9..c70d92d40de --- src/hg/lib/trackHub.c +++ src/hg/lib/trackHub.c @@@ -1947,42 -1957,44 +1965,46 @@@ /* Make sure the tdb is a track type we grok. badList may be NULL to validate * silently (no user-facing complaint about non-liftable types). */ { // trackDb types are matched without regard to case since that's how the rest of the // browser reads them (some trackDb stanzas say "bigbed" rather than "bigBed"). if (sameString("cytoBandIdeo", trackHubSkipHubName(tdb->track)) || !( startsWithNoCase("bigBed", tdb->type) || \ startsWithNoCase("bigWig", tdb->type) || \ startsWithNoCase("bigDbSnp", tdb->type) || \ startsWithNoCase("bigGenePred", tdb->type) || \ startsWithNoCase("gvf", tdb->type) || \ startsWithNoCase("genePred", tdb->type) || \ startsWithNoCase("narrowPeak", tdb->type) || \ startsWithNoCase("broadPeak", tdb->type) || \ startsWithNoCase("bigLolly", tdb->type) || \ + (startsWithNoCase("bigNet", tdb->type) && trackHubBigNetEnabled()) || \ + (isAlignmentType(tdb->type) && quickLiftAlignmentsEnabled(cart)) || \ sameWord("bed", tdb->type) || startsWithNoCase("bed ", tdb->type))) { if (badList != NULL) slAddHead(badList, tdb); return FALSE; } // make sure we have a bigDataUrl if (startsWithNoCase("bigBed", tdb->type) || \ + startsWithNoCase("bigNet", tdb->type) || \ + startsWithNoCase("bigPsl", tdb->type) || \ + startsWithNoCase("bigChain", tdb->type) || \ + startsWithNoCase("bigMaf", tdb->type) || \ startsWithNoCase("bigWig", tdb->type)) { char *fileName = cloneString(trackDbSetting(tdb, "bigDataUrl")); if (fileName == NULL) { struct sqlConnection *conn = hAllocConnTrack(db, tdb); fileName = bbiNameFromSettingOrTable(tdb, conn, tdb->table); hashAdd(tdb->settingsHash, "bigDataUrl", fileName); hFreeConn(&conn); } } return TRUE; }