957f2123050742982ef6c7aefcab70d29144924c braney Mon Oct 9 17:49:04 2017 -0700 allow bedGraph. Change names in collections so they don't match names in trackDb, move the copying of custom tracks and collections to BEFORE the load of trackHubs, misc other bugs diff --git src/hg/lib/cart.c src/hg/lib/cart.c index b5fe2c9..f7d158c 100644 --- src/hg/lib/cart.c +++ src/hg/lib/cart.c @@ -828,39 +828,39 @@ char *url = cartString(cart, hgsLoadUrlName); struct lineFile *lf = netLineFileOpen(url); cartLoadSettings(lf, cart, oldVars, hgsDoLoadUrl); lineFileClose(&lf); cartTrace(cart, "after cartLS", conn); didSessionLoad = TRUE; } } #endif /* GBROWSE */ /* wire up the assembly hubs so we can operate without sql */ setUdcTimeout(cart); if (cartVarExists(cart, hgHubDoDisconnect)) doDisconnectHub(cart); -pushWarnHandler(cartHubWarn); -char *newDatabase = hubConnectLoadHubs(cart); -popWarnHandler(); - #ifndef GBROWSE if (didSessionLoad) cartCopyCustomTracks(cart); #endif /* GBROWSE */ +pushWarnHandler(cartHubWarn); +char *newDatabase = hubConnectLoadHubs(cart); +popWarnHandler(); + if (newDatabase != NULL) { char *cartDb = cartOptionalString(cart, "db"); if ((cartDb == NULL) || differentString(cartDb, newDatabase)) { // this is some magic to use the defaultPosition and reset cart variables if (oldVars) { struct hashEl *hel; if ((hel = hashLookup(oldVars,"db")) != NULL) hel->val = "none"; else hashAdd(oldVars, "db", "none"); }