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/lib/customFactory.c src/hg/lib/customFactory.c index 755cb27..d06c8e4 100644 --- src/hg/lib/customFactory.c +++ src/hg/lib/customFactory.c @@ -2701,31 +2701,31 @@ static struct customTrack *bigWigLoader(struct customFactory *fac, struct hash *chromHash, struct customPp *cpp, struct customTrack *track, boolean dbRequested) /* Load up wiggle data until get next track line. */ { /* Not much to this. A bigWig has nothing here but a track line. */ struct hash *settings = track->tdb->settingsHash; char *bigDataUrl = hashFindVal(settings, "bigDataUrl"); requireBigDataUrl(bigDataUrl, fac->name, track->tdb->shortLabel); checkAllowedBigDataUrlProtocols(bigDataUrl); /* protect against temporary network error */ struct errCatch *errCatch = errCatchNew(); if (errCatchStart(errCatch)) { - track->bbiFile = bigWigFileOpenAlias(bigDataUrl, chromAliasGetHash(NULL)); + track->bbiFile = bigWigFileOpenAlias(bigDataUrl, chromAliasChromToAliasHash(NULL)); setBbiViewLimits(track); } errCatchEnd(errCatch); if (errCatch->gotError) { track->networkErrMsg = cloneString(errCatch->message->string); } errCatchFree(&errCatch); return track; } static struct customFactory bigWigFactory = /* Factory for wiggle tracks */ { @@ -2845,31 +2845,31 @@ static struct customTrack *bigBedLoader(struct customFactory *fac, struct hash *chromHash, struct customPp *cpp, struct customTrack *track, boolean dbRequested) /* Load up big bed data until get next track line. */ { /* Not much to this. A bigBed has nothing here but a track line. */ struct hash *settings = track->tdb->settingsHash; char *bigDataUrl = hashFindVal(settings, "bigDataUrl"); requireBigDataUrl(bigDataUrl, fac->name, track->tdb->shortLabel); checkAllowedBigDataUrlProtocols(bigDataUrl); /* protect against temporary network error */ struct errCatch *errCatch = errCatchNew(); if (errCatchStart(errCatch)) { - track->bbiFile = bigBedFileOpenAlias(bigDataUrl, chromAliasGetHash(NULL)); + track->bbiFile = bigBedFileOpenAlias(bigDataUrl, chromAliasChromToAliasHash(NULL)); } errCatchEnd(errCatch); if (errCatch->gotError) { track->networkErrMsg = cloneString(errCatch->message->string); return track; } errCatchFree(&errCatch); setBbiViewLimits(track); track->dbTrackType = cloneString("bigBed"); track->fieldCount = track->bbiFile->definedFieldCount; return track; }