8f1411e5356e0a7adaa7da6e7e8035ec6347b6d3 hiram Tue May 7 11:27:49 2019 -0700 avoid needless leading underscores _ in hub naming schemes refs #18869 diff --git src/hg/lib/trackHub.c src/hg/lib/trackHub.c index fe807dd..71a28b4 100644 --- src/hg/lib/trackHub.c +++ src/hg/lib/trackHub.c @@ -460,31 +460,34 @@ } if (hubAssemblyHash == NULL) hubAssemblyHash = newHash(5); if ((hel = hashLookup(hubAssemblyHash, genome->name)) == NULL) hashAdd(hubAssemblyHash, genome->name, genome); } static char *addHubName(char *base, char *hubName) { if (base == NULL) return NULL; char buffer[4096]; +if (isNotEmpty(hubName)) safef(buffer, sizeof(buffer), "%s_%s", hubName, base); +else + safef(buffer, sizeof(buffer), "%s", base); return cloneString(buffer); } static int genomeOrderKeyCmp(const void *va, const void *vb) /* Compare to sort based on order key */ { const struct trackHubGenome *a = *((struct trackHubGenome **)va); const struct trackHubGenome *b = *((struct trackHubGenome **)vb); if (b->orderKey > a->orderKey) return -1; else if (b->orderKey < a->orderKey) return 1; else return 0; }