1bb62b14d1241d1bebf9f0665c2eb7e0a2334ca5 braney Thu Oct 11 13:01:58 2012 -0700 this resolves the '+' in track names problem (#9254) by modifying all hub track names by changing all characters that aren't alphanumeric or dash or underbar into underbars. I also added code to check for track name overlaps, and confirmed that none of the hubs in hgcentral.hubStatus would end up with duplicated track names because of this munging. I also changed the udcTimeout in hubCheck to be 1 second. diff --git src/hg/hgTracks/hgTracks.c src/hg/hgTracks/hgTracks.c index 5f77f83..8031013 100644 --- src/hg/hgTracks/hgTracks.c +++ src/hg/hgTracks/hgTracks.c @@ -3418,31 +3418,34 @@ { if (isEmpty(hub->errorMessage)) { /* error catching in so it won't just abort */ struct errCatch *errCatch = errCatchNew(); if (errCatchStart(errCatch)) { struct trackDb *tdbList = hubAddTracks(hub, database, pHubList); addTdbListToTrackList(tdbList, NULL, pTrackList); // we're going to free the hubConnectStatus list hub->trackHub = NULL; } errCatchEnd(errCatch); if (errCatch->gotError) + { + warn(errCatch->message->string); hubUpdateStatus( errCatch->message->string, hub); + } else hubUpdateStatus(NULL, hub); errCatchFree(&errCatch); } } hubConnectStatusFreeList(&hubList); } boolean restrictionEnzymesOk() /* Check to see if it's OK to do restriction enzymes. */ { return (sqlDatabaseExists("hgFixed") && hTableExists("hgFixed", "cutters") && hTableExists("hgFixed", "rebaseRefs") && hTableExists("hgFixed", "rebaseCompanies")); }