07180b149b187970f5cb3f272c607f5b24b57dee hiram Thu May 11 14:32:50 2023 -0700 correct hgdownload path for chromAlias and chrom.sizes file for "curated" hub refs #31257 diff --git src/hg/lib/trackHub.c src/hg/lib/trackHub.c index dcbbfdb..c6dc18e 100644 --- src/hg/lib/trackHub.c +++ src/hg/lib/trackHub.c @@ -404,46 +404,67 @@ if (fileName) absFileName = trackHubRelativeUrl((genome->trackHub)->url, fileName); if (absFileName) { hashReplace(genome->settingsHash, tagName, absFileName); fileName = absFileName; } return fileName; } char *trackHubChromSizes(char *database) /* see if this assembly hub has a chrom.sizes file, return url if present * returns NULL when not present */ { +if (hubConnectIsCurated(trackHubSkipHubName(database))) + { + char urlPath[PATH_LEN]; + safef(urlPath, sizeof(urlPath), "https://hgdownload.soe.ucsc.edu/goldenPath/%s/bigZips/%s.chrom.sizes.txt", trackHubSkipHubName(database), trackHubSkipHubName(database)); + return cloneString(urlPath); + } +else return assemblyHubGenomeSetting(database, "chromSizes"); } char *trackHubAliasBbFile(char *database) /* see if this assembly hub has an alias bigBed file, return url if present * returns NULL when not present */ { +if (hubConnectIsCurated(trackHubSkipHubName(database))) + { + char urlPath[PATH_LEN]; + safef(urlPath, sizeof(urlPath), "https://hgdownload.soe.ucsc.edu/goldenPath/%s/bigZips/%s.chromAlias.bb", trackHubSkipHubName(database), trackHubSkipHubName(database)); + return cloneString(urlPath); + } +else return assemblyHubGenomeSetting(database, "chromAliasBb"); } char *trackHubAliasFile(char *database) /* see if this assembly hub has an alias file, return url if present * returns NULL when not present */ { +if (hubConnectIsCurated(trackHubSkipHubName(database))) + { + char urlPath[PATH_LEN]; + safef(urlPath, sizeof(urlPath), "https://hgdownload.soe.ucsc.edu/goldenPath/%s/bigZips/%s.chromAlias.txt", trackHubSkipHubName(database), trackHubSkipHubName(database)); + return cloneString(urlPath); + } +else return assemblyHubGenomeSetting(database, "chromAlias"); } struct chromInfo *trackHubAllChromInfo(char *database) /* Return a chromInfo structure for all the chroms in this database. */ { struct trackHubGenome *genome = trackHubGetGenome(database); if (genome == NULL) return NULL; if (genome->tbf == NULL) genome->tbf = openTwoBit(genome); struct chromInfo *ci, *ciList = NULL; struct slName *chromList = twoBitSeqNames(genome->twoBitPath);