1fa73a25ef37e37286c5b86e810c684efbef6e9b lrnassar Tue Sep 22 15:22:40 2020 -0700 Improving the message when a collection is removed by the trash cleaners, refs #26075 diff --git src/hg/lib/hubConnect.c src/hg/lib/hubConnect.c index 3fccad0..bc0c6dc 100644 --- src/hg/lib/hubConnect.c +++ src/hg/lib/hubConnect.c @@ -181,42 +181,44 @@ { struct hubConnectStatus *hub = NULL; char query[1024]; sqlSafef(query, sizeof(query), "select hubUrl,status, errorMessage,lastNotOkTime, shortLabel from %s where id=%d", getHubStatusTableName(), id); struct sqlResult *sr = sqlGetResult(conn, query); char **row = sqlNextRow(sr); if (row != NULL) { 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)) { boolean isCollection = (strstr(hub->hubUrl, "hgComposite") != NULL); if (isCollection) - warn("Your Track Collections have been removed by our trash collectors. If you'd like your Track Collections to stay on our servers, you need to save them in a session." ); + warn("It looks as though you made a Track " + "Collection on a previous visit, which has since been deleted. Collections " + "expire 48 hours after their last use. You must " + "save your session to preserve collections long-term and to allow sharing."); else 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();