21dc568ad9fe4e77547cb5f018fe6d3dab713430 braney Fri May 12 13:23:41 2023 -0700 Revert "correct hgdownload path for chromAlias and chrom.sizes file for "curated" hub refs #31257" This reverts commit 07180b149b187970f5cb3f272c607f5b24b57dee. diff --git src/hg/lib/trackHub.c src/hg/lib/trackHub.c index c6dc18e..dcbbfdb 100644 --- src/hg/lib/trackHub.c +++ src/hg/lib/trackHub.c @@ -404,67 +404,46 @@ 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);