fdf156b7fd0e45b245329dbf6c4e1fc286d61941 braney Sat May 13 09:36:50 2023 -0700 make sure the cart has the right "db" when a curated hub has been selected from hgGateway diff --git src/hg/lib/hubConnect.c src/hg/lib/hubConnect.c index 739bce0..cc2488c 100644 --- src/hg/lib/hubConnect.c +++ src/hg/lib/hubConnect.c @@ -1050,35 +1050,37 @@ dbDbTable(), db, hubCuratedPrefix); char *dir = cloneString(sqlQuickString(conn, query)); hDisconnectCentral(&conn); if (isNotEmpty(dir)) { char *path = &dir[sizeof hubCuratedPrefix - 1]; char url[4096]; safef(url, sizeof url, "%s/%s/hub.txt", path, curatedHubPrefix); struct hubConnectStatus *status = getAndSetHubStatus( cart, url, TRUE); if (status && isEmpty(status->errorMessage)) { + char buffer[4096]; + safef(buffer, sizeof buffer, "hub_%d_%s", status->id, db); + + cartSetString(cart, "db", buffer); if (cgiOptionalString("db")) { /* user specified db on URL, we need to decorate and put it back. */ - char buffer[4096]; - safef(buffer, sizeof buffer, "hub_%d_%s", status->id, db); cgiVarSet("db", cloneString(buffer)); } return status->id; } else { if (isNotEmpty(status->errorMessage)) errAbort("Hub error: url %s: error %s.", url, status->errorMessage); else errAbort("Cannot open hub %s.", url); } } return 0;