472da2c8446e1ec45b22ea16c764187dc2ca5c55 braney Tue Nov 4 14:11:49 2014 -0800 remove tabs from short and long labels on tracks in track hubs. #13741 diff --git src/hg/lib/trackHub.c src/hg/lib/trackHub.c index 878a7b4..429841b 100644 --- src/hg/lib/trackHub.c +++ src/hg/lib/trackHub.c @@ -688,31 +688,35 @@ } struct trackHubGenome *trackHubFindGenome(struct trackHub *hub, char *genomeName) /* Return trackHubGenome of given name associated with hub. Return NULL if no * such genome. */ { return hashFindVal(hub->genomeHash, genomeName); } static void validateOneTrack( struct trackHub *hub, struct trackHubGenome *genome, struct trackDb *tdb) /* Validate a track's trackDb entry. */ { /* Check for existence of fields required in all tracks */ requiredSetting(hub, genome, tdb, "shortLabel"); +char *shortLabel = trackDbSetting(tdb, "shortLabel"); +memSwapChar(shortLabel, strlen(shortLabel), '\t', ' '); requiredSetting(hub, genome, tdb, "longLabel"); +char *longLabel = trackDbSetting(tdb, "longLabel"); +memSwapChar(longLabel, strlen(longLabel), '\t', ' '); /* Forbid any dangerous settings that should not be allowed */ forbidSetting(hub, genome, tdb, "idInUrlSql"); // subtracks is not NULL if a track said we were its parent if (tdb->subtracks != NULL) { boolean isSuper = FALSE; char *superTrack = trackDbSetting(tdb, "superTrack"); if ((superTrack != NULL) && startsWith("on", superTrack)) isSuper = TRUE; if (!(trackDbSetting(tdb, "compositeTrack") || trackDbSetting(tdb, "container") || isSuper))