6c2d7c1b83c8d6155ea77aa76bae0d06c3720ceb hiram Wed Jul 3 09:34:03 2024 -0700 eliminte the dependency upon specific genArk genome names, use the genark table for questions about existence, refs #32596 diff --git src/hg/lib/cart.c src/hg/lib/cart.c index 3575e50..d99504e 100644 --- src/hg/lib/cart.c +++ src/hg/lib/cart.c @@ -1391,44 +1391,44 @@ hideIfNotInCart(cart, tdb->track); } // Don't do this again until someone sets this variable, // presumably on session load. cartRemove(cart, CART_HAS_DEFAULT_VISIBILITY); } static void fixUpDb(struct cart *cart) // we want to load Genark hubs or error out if db is not available { char *db = cartOptionalString(cart,"db"); if ((db == NULL) || startsWith("hub_", db) || sameString("0", db)) return; -else if (startsWith("GCA_", db) || startsWith("GCF_", db)) +else { char *url = genarkUrl(db); if (url != NULL) { cartSetString(cart, "genome", db); cartSetString(cart, "hubUrl", url); cartRemove(cart, "db"); } - } else if (!hDbIsActive(db)) errAbort("Can not find database '%s'", db); } +} struct cart *cartNew(char *userId, char *sessionId, char **exclude, struct hash *oldVars) /* Load up cart from user & session id's. Exclude is a null-terminated list of * strings to not include */ { cgiApoptosisSetup(); if (cfgOptionBooleanDefault("showEarlyErrors", TRUE)) errAbortSetDoContentType(TRUE); if (cfgOptionBooleanDefault("suppressVeryEarlyErrors", FALSE)) htmlSuppressErrors(); setUdcCacheDir(); netSetTimeoutErrorMsg("A connection timeout means that either the server is offline or its firewall, the UCSC firewall or any router between the two blocks the connection.");