27b25a4e86b49bb8d618b61684beecd81fa84d7b braney Tue Jan 2 12:26:30 2018 -0800 fix a problem with oligo track on assembly hubs diff --git src/hg/lib/mdb.c src/hg/lib/mdb.c index ac9482e..250b3d3 100644 --- src/hg/lib/mdb.c +++ src/hg/lib/mdb.c @@ -3261,31 +3261,31 @@ mdbObj->obj = cloneString(tdb->table?tdb->table:tdb->track); AllocVar(mdbObj->vars); mdbObj->vars->var = cloneString(MDB_OBJ_TYPE); mdbObj->vars->val = cloneString(MDB_OBJ_TYPE_TABLE); mdbObj->varHash = hashNew(8); hashAdd(mdbObj->varHash, mdbObj->vars->var, mdbObj->vars); mdbObj = mdbObjAddVarPairs(mdbObj,setting); mdbObjRemoveVars(mdbObj,MDB_VAR_TABLENAME); // NOTE: Special hint that the tdb metadata return mdbObj; // is used since no mdb metadata is found } const struct mdbObj *metadataForTable(char *db,struct trackDb *tdb,char *table) // Returns the metadata for a table. NEVER FREE THIS STRUCT! { struct mdbObj *mdbObj = NULL; -if (isHubTrack(tdb->track)) +if (isHubTrack(tdb->track) || isHubTrack(db)) // check is track is on a hub, or if database is hub return metadataForTableFromTdb(tdb); // FIXME: metadata setting in TDB soon to be obsolete // See of the mdbObj was already built if (tdb != NULL) { mdbObj = tdbExtrasMdb(tdb); if (mdbObj == METADATA_NOT_FOUND) // NOT in mtatbl, not in tdb metadata setting! return NULL; else if (mdbObj == MDB_NOT_FOUND) // looked mdb already and not found! return metadataForTableFromTdb(tdb); else if (mdbObj != NULL) { return mdbObj; // No reason to query the table again! } }