ba87d8471c9c78f15412ccad2aaba9b46d1af38e hiram Tue Jul 2 16:14:47 2024 -0700 eliminte the dependency upon specific genArk genome names, use the genark table for questions about existence, refs #32596 diff --git src/hg/hubApi/apiUtils.c src/hg/hubApi/apiUtils.c index 6df59a0..a2aaf6d 100644 --- src/hg/hubApi/apiUtils.c +++ src/hg/hubApi/apiUtils.c @@ -723,54 +723,30 @@ /* see if this hub has an alias file and run chromAliasSetupBb() for it */ { if (hubGenome->settingsHash) { char *aliasFile = hashFindVal(hubGenome->settingsHash, "chromAliasBb"); char *absFileName = NULL; if (aliasFile) absFileName = trackHubRelativeUrl((hubGenome->trackHub)->url, aliasFile); if (absFileName) { chromAliasSetupBb(NULL, absFileName); } } } -char *genArkPath(char *genome) -/* given a GenArk hub genome name, e.g. GCA_021951015.1 return the path: - * GCA/021/951/015/GCA_021951015.1 - * prefix that with desired server URL: https://hgdownload.soe.ucsc.edu/hubs/ - * if desired. Or suffix add /hub.txt to get the hub.txt URL - * - * already been proven that genome is a GCx_ name prefix before calling - */ -{ -struct dyString *genArkPath = dyStringNew(0); - -char tmpBuf[4]; -safencpy(tmpBuf, sizeof(tmpBuf), genome, 3); -dyStringPrintf(genArkPath, "%s/", tmpBuf); -safencpy(tmpBuf, sizeof(tmpBuf), genome+4, 3); -dyStringPrintf(genArkPath, "%s/", tmpBuf); -safencpy(tmpBuf, sizeof(tmpBuf), genome+7, 3); -dyStringPrintf(genArkPath, "%s/", tmpBuf); -safencpy(tmpBuf, sizeof(tmpBuf), genome+10, 3); -dyStringPrintf(genArkPath, "%s", tmpBuf); - -return dyStringCannibalize(&genArkPath); -} - static struct dyString *textOutput = NULL; void textLineOut(char *lineOut) /* accumulate text lines for output in the dyString textOutput */ { if (NULL == textOutput) { char outString[1024]; textOutput = dyStringNew(0); time_t timeNow = time(NULL); struct tm tm; gmtime_r(&timeNow, &tm); safef(outString, sizeof(outString), "# downloadTime: \"%d:%02d:%02dT%02d:%02d:%02dZ\"", 1900+tm.tm_year, tm.tm_mon+1, tm.tm_mday, tm.tm_hour, tm.tm_min,