0a825d5861f162d34ceae24e8c5f09863c9aea16 braney Sat Aug 22 06:22:16 2020 -0700 fix up hgNearTest to know about separate knownGene databases diff --git src/hg/lib/hdb.c src/hg/lib/hdb.c index 6a8e97b..9d52867 100644 --- src/hg/lib/hdb.c +++ src/hg/lib/hdb.c @@ -5813,35 +5813,39 @@ return masterGeneTrack; struct sqlConnection *conn = hAllocConn(knownDb); char query[4096]; sqlSafef(query, ArraySize(query), "select name from masterGeneTrack"); masterGeneTrack = sqlQuickString(conn, query); hFreeConn(&conn); return masterGeneTrack; } char *hdbDefaultKnownDb(char *db) /* Get the default knownGene database from the defaultKnown table. */ { +static char *checkedDb = NULL; static char *knownDb = NULL; -if (knownDb) // if we already know it, return it. +if (sameOk(checkedDb, db)) // if we already know it, return it. return knownDb; +knownDb = NULL; struct sqlConnection *conn = hAllocConn(db); if (sqlTableExists(conn, "defaultKnown")) { char query[4096]; sqlSafef(query, ArraySize(query), "select name from defaultKnown"); knownDb = sqlQuickString(conn, query); } hFreeConn(&conn); if (knownDb == NULL) knownDb = cloneString(db); +checkedDb = cloneString(db); + return knownDb; }