95030f73f067d8e8f9221a09c1811784607e4e72 markd Fri Jul 10 17:51:29 2020 -0700 split dynamic server genomeDataPrefix into genome and genomeDataDir. More verbose, but clearer diff --git src/hg/lib/trackHub.c src/hg/lib/trackHub.c index 3a3300d..8ba0d0f 100644 --- src/hg/lib/trackHub.c +++ src/hg/lib/trackHub.c @@ -1153,63 +1153,63 @@ void trackHubFindPos(struct cart *cart, char *db, char *term, struct hgPositions *hgp) /* Look for term in track hubs. Update hgp if found */ { struct trackDb *tdbList = NULL; if (trackHubDatabase(db)) { struct trackHubGenome *genome = trackHubGetGenome(db); tdbList = trackHubTracksForGenome(genome->trackHub, genome); } else tdbList = hubCollectTracks(db, NULL); findBigBedPosInTdbList(cart, db, tdbList, term, hgp, NULL); } -boolean trackHubGetBlatParams(char *database, boolean isTrans, char **pHost, char **pPort, char **pDynGenomeDir) +boolean trackHubGetBlatParams(char *database, boolean isTrans, char **pHost, char **pPort, char **pGenomeDataDir) { char *setting; if (isTrans) { setting = trackHubAssemblyField(database, "transBlat"); } else { setting = trackHubAssemblyField(database, "blat"); } if (setting == NULL) return FALSE; char *conf = trimSpaces(cloneString(setting)); int numWords = chopByWhite(conf, NULL, 5); if ((numWords < 2) || (numWords > 4)) errAbort("invalid configuration for hub BLAT server, expect 2 or 4 arguments: %s", setting); char *words[4]; chopByWhite(conf, words, numWords); *pHost = words[0]; *pPort = words[1]; if (numWords > 2) { if (!sameString(words[2], "dynamic")) errAbort("invalid configuration for hub BLAT server, third argument should be 'dynamic' or omitted, got: %s", words[2]); - *pDynGenomeDir = words[3]; + *pGenomeDataDir = words[3]; } else - *pDynGenomeDir = NULL; + *pGenomeDataDir = NULL; return TRUE; } void hubCheckBigDataUrl(struct trackHub *hub, struct trackHubGenome *genome, struct trackDb *tdb) /* Check remote file exists and is of correct type. Wrap this in error catcher */ { char *relativeUrl = trackDbSetting(tdb, "bigDataUrl"); if (relativeUrl != NULL) { char *type = trackDbRequiredSetting(tdb, "type"); char *bigDataUrl = trackHubRelativeUrl(genome->trackDbFile, relativeUrl); char *bigDataIndex = NULL; char *relIdxUrl = trackDbSetting(tdb, "bigDataIndex");