01899c8f3d57fb8312feec65423f5053d64b85ef braney Mon Feb 26 13:54:01 2018 -0800 let assembly hubs have groups from track hubs diff --git src/hg/lib/hubConnect.c src/hg/lib/hubConnect.c index ff6fa11..6b1ca82 100644 --- src/hg/lib/hubConnect.c +++ src/hg/lib/hubConnect.c @@ -192,30 +192,32 @@ AllocVar(hub); hub->id = id; hub->hubUrl = cloneString(row[0]); hub->status = sqlUnsigned(row[1]); hub->errorMessage = cloneString(row[2]); char *shortLabel = row[4]; if (isEmpty(row[2]) || hubTimeToCheck(hub, row[3])) { char *errorMessage = NULL; hub->trackHub = fetchHub( hub, &errorMessage); hub->errorMessage = cloneString(errorMessage); hubUpdateStatus( hub->errorMessage, hub); if (!isEmpty(hub->errorMessage)) { + // we need to do something special here to + // not warn about local hubs disappearing warn("Could not connect to hub \"%s\": %s", shortLabel, hub->errorMessage); } } } sqlFreeResult(&sr); return hub; } struct hubConnectStatus *hubConnectStatusListFromCartAll(struct cart *cart) /* Return list of all track hubs that are referenced by cart. */ { struct hubConnectStatus *hubList = NULL, *hub; struct slPair *pair, *pairList = cartVarsWithPrefix(cart, hgHubConnectHubVarPrefix); struct sqlConnection *conn = hConnectCentral(); for (pair = pairList; pair != NULL; pair = pair->next) @@ -750,35 +752,32 @@ /* error catching in so it won't just abort */ struct errCatch *errCatch = errCatchNew(); if (errCatchStart(errCatch)) { struct trackDb *thisList = hubAddTracks(hub, database); tdbList = slCat(tdbList, thisList); } errCatchEnd(errCatch); if (errCatch->gotError) { warn("%s", errCatch->message->string); hubUpdateStatus( errCatch->message->string, hub); } else { - if (!trackHubDatabase(database)) - { struct grp *grp = grpFromHub(hub); slAddHead(&hubGroups, grp); - } hubUpdateStatus(NULL, hub); } errCatchFree(&errCatch); } } hubTrackDbs = tdbList; if (pGroupList != NULL) *pGroupList = hubGroups; return tdbList; } static struct hubConnectStatus *globalHubList;