89cdb67d6b259acf5514e5bec9314126fa543486 braney Fri May 12 13:31:50 2023 -0700 make sure curated hubs are using hgdownload for downloads diff --git src/hg/hgTracks/hgTracks.c src/hg/hgTracks/hgTracks.c index f74ff9a..350468b 100644 --- src/hg/hgTracks/hgTracks.c +++ src/hg/hgTracks/hgTracks.c @@ -10656,51 +10656,52 @@ printLongWithCommas(stdout, scafCount); cgiTableFieldEnd(); cgiSimpleTableFieldStart(); printLongWithCommas(stdout, totalSize); cgiTableFieldEnd(); } cgiTableRowEnd(); } sqlFreeResult(&sr); hFreeConn(&conn); } static void chromSizesDownloadRow(boolean hasAlias, char *hubAliasFile, char *chromSizesFile) /* Show link to chrom.sizes file at end of chromInfo table (unless this is a hub) */ { -if (! trackHubDatabase(database)) +if (! trackHubDatabase(database) || hubConnectIsCurated(trackHubSkipHubName(database))) { + char *db = trackHubSkipHubName(database); cgiSimpleTableRowStart(); cgiSimpleTableFieldStart(); puts("Download as file:"); cgiTableFieldEnd(); cgiSimpleTableFieldStart(); printf("<a href='http://%s/goldenPath/%s/bigZips/%s.chrom.sizes' target=_blank>%s.chrom.sizes</a>", - hDownloadsServer(), database, database, database); + hDownloadsServer(), db, db, db); cgiTableFieldEnd(); if (hasAlias) { cgiSimpleTableFieldStart(); /* see if this database has the chromAlias.txt download file */ char aliasFile[1024]; - safef(aliasFile, sizeof aliasFile, "http://%s/goldenPath/%s/bigZips/%s.chromAlias.txt", hDownloadsServer(), database, database); + safef(aliasFile, sizeof aliasFile, "http://%s/goldenPath/%s/bigZips/%s.chromAlias.txt", hDownloadsServer(), db, db); struct udcFile *file = udcFileMayOpen(aliasFile, udcDefaultDir()); if (file) { udcFileClose(&file); - printf("<a href='%s' target=_blank>%s.chromAlias.txt</a>", aliasFile, database); + printf("<a href='%s' target=_blank>%s.chromAlias.txt</a>", aliasFile, db); } else puts(" "); cgiTableFieldEnd(); } cgiTableRowEnd(); } else if (hubAliasFile) { cgiSimpleTableRowStart(); cgiSimpleTableFieldStart(); puts("Download as file:"); cgiTableFieldEnd(); cgiSimpleTableFieldStart(); if (chromSizesFile)