7f87f28f5603d0d1619c8421d0e4aa7e71e2cd79 braney Tue Apr 5 14:44:33 2022 -0700 Revert "when grabbing liftOver chains, don't check for database base presence" This reverts commit 4231bb41a4af90422596fcc33304a6a20e654dc6. diff --git src/hg/lib/hdb.c src/hg/lib/hdb.c index 1ccb9c5..53922b5 100644 --- src/hg/lib/hdb.c +++ src/hg/lib/hdb.c @@ -2829,31 +2829,31 @@ return hDbDbListMaybeCheck(TRUE); } static struct dbDb *hDbDbListDeadOrAlive() /* Return list of databases named in dbDb whether they exist or not. * The list includes the name, description, and where to * find the nib-formatted DNA files. Free this with dbDbFree. */ { return hDbDbListMaybeCheck(FALSE); } struct hash *hDbDbHash() /* The hashed-up version of the entire dbDb table, keyed on the db */ { struct hash *dbDbHash = newHash(16); -struct dbDb *list = hDbDbListDeadOrAlive(); +struct dbDb *list = hDbDbList(); struct dbDb *dbdb; for (dbdb = list; dbdb != NULL; dbdb = dbdb->next) hashAdd(dbDbHash, dbdb->name, dbdb); return dbDbHash; } int hDbDbCmpOrderKey(const void *va, const void *vb) /* Compare to sort based on order key */ { const struct dbDb *a = *((struct dbDb **)va); const struct dbDb *b = *((struct dbDb **)vb); if (b->orderKey > a->orderKey) return -1; else if (b->orderKey < a->orderKey) return 1; else return 0; @@ -4850,31 +4850,31 @@ struct dbDb *liftOverDbList = NULL, *dbDb, *nextDbDb; struct liftOverChain *chainList = NULL, *chain; struct hash *hash = newHash(0), *dbNameHash = newHash(3); /* Get list of all liftOver chains in central database */ chainList = liftOverChainList(); /* Create hash of databases having liftOver chains from this database */ for (chain = chainList; chain != NULL; chain = chain->next) { if (!hashFindVal(hash, chain->fromDb)) hashAdd(hash, chain->fromDb, chain->fromDb); } /* Get list of all databases */ -allDbList = hDbDbListDeadOrAlive(); +allDbList = hDbDbList(); /* Create a new dbDb list of all entries in the liftOver hash */ for (dbDb = allDbList; dbDb != NULL; dbDb = nextDbDb) { /* current dbDb entries */ nextDbDb = dbDb->next; if (hashFindVal(hash, dbDb->name) && !hashFindVal(dbNameHash, dbDb->name)) { slAddHead(&liftOverDbList, dbDb); hashAdd(dbNameHash, dbDb->name, dbDb->name); } else dbDbFree(&dbDb); }