088c1ae0aed4212f6939ac991cb6fe7d1393acda braney Tue Jan 10 10:18:49 2023 -0800 revert a change I made to recognize bad db's instead of defaulting to the cart or hg38, but this broke undecorated specification of "genome", which is handled through the cart. Oops. diff --git src/hg/lib/web.c src/hg/lib/web.c index c6adf24..06b3446 100644 --- src/hg/lib/web.c +++ src/hg/lib/web.c @@ -908,37 +908,34 @@ * In the cart only, we use the same order of preference. * If someone requests an Genome we try to give them the same db as * was in their cart, unless the Genome doesn't match. */ { boolean gotClade = hGotClade(); *retDb = (dbOveride != NULL) ? dbOveride : cgiOptionalString(dbCgiName); if (*retDb == NULL) // if db is not in URL, but genome is, use it for db *retDb = cgiOptionalString(hgHubGenome); *retGenome = cgiOptionalString(orgCgiName); *retClade = cgiOptionalString(cladeCgiName); /* Was the database passed in as a cgi param? * If so, it takes precedence and determines the genome. */ -if (*retDb) - { *retDb = asmAliasFind(*retDb); - if (hDbExists(*retDb)) +if (*retDb && hDbExists(*retDb)) + { *retGenome = hGenome(*retDb); - else - errAbort("No db called %s", *retDb); } /* If no db was passed in as a cgi param then was the organism (a.k.a. genome) * passed in as a cgi param? * If so, the we use the proper database for that genome. */ else if (*retGenome && !sameWord(*retGenome, "0")) { *retDb = getDbForGenome(*retGenome, cart); *retGenome = hGenome(*retDb); } else if (*retClade && gotClade) { *retGenome = hDefaultGenomeForClade(*retClade); *retDb = getDbForGenome(*retGenome, cart); } /* If no cgi params passed in then we need to inspect the session */