532a820d6421a92ae969b83f0e267f60fae125b0 braney Mon Jul 1 14:14:54 2024 -0700 check for /gbdb values for remapping for curated track hubs diff --git src/hg/lib/chromAlias.c src/hg/lib/chromAlias.c index 87769d8..4db3d59 100644 --- src/hg/lib/chromAlias.c +++ src/hg/lib/chromAlias.c @@ -264,37 +264,37 @@ struct slName *fieldNames = bbFieldNames(chromAliasGlobals.bbi); chromAliasGlobals.fieldCount = slCount(fieldNames) - chromAliasGlobals.bbi->definedFieldCount; AllocArray(chromAliasGlobals.fields, chromAliasGlobals.fieldCount); int ii; for(ii=0; ii < chromAliasGlobals.bbi->definedFieldCount; ii++, fieldNames = fieldNames->next) ; for(ii=0; ii < chromAliasGlobals.fieldCount; ii++, fieldNames = fieldNames->next) chromAliasGlobals.fields[ii] = fieldNames->name; chromAliasGlobals.bptList = bbiAliasOpenExtra(chromAliasGlobals.bbi); chromAliasGlobals.lm = lmInit(0); } static void chromAliasSetupHub(char *database) /* Look for a chromAlias text table and load the hashes with its contents. */ { -char *aliasBbFile = trackHubAliasBbFile(database); +char *aliasBbFile = hReplaceGbdb(trackHubAliasBbFile(database)); if (aliasBbFile != NULL) { chromAliasSetupBb(database, aliasBbFile); return; } -char *aliasFile = trackHubAliasFile(database); +char *aliasFile = hReplaceGbdb(trackHubAliasFile(database)); if (aliasFile == NULL) return; struct lineFile *lf = udcWrapShortLineFile(aliasFile, NULL, MAX_HUB_TRACKDB_FILE_SIZE); chromAliasGlobals.chromToAliasHash = hashNew(0); chromAliasGlobals.aliasToChromHash = hashNew(0); char *line; if (!lineFileNext(lf, &line, NULL)) errAbort("%s is empty", lf->fileName); lineFileReuse(lf); struct errCatch *errCatch = errCatchNew(); if (errCatchStart(errCatch))