7338fb10bb7ffdc0a75445a36cd128e6be593d36 braney Mon Feb 26 10:51:47 2024 -0800 fix a bunch of places that were printing out hub_#_db instead of just db diff --git src/hg/hgTables/schema.c src/hg/hgTables/schema.c index cd461ee..7edfdd5 100644 --- src/hg/hgTables/schema.c +++ src/hg/hgTables/schema.c @@ -18,30 +18,31 @@ #include "trackDb.h" #include "joiner.h" #include "tableDescriptions.h" #include "asParse.h" #include "customTrack.h" #include "bedCart.h" #include "hgMaf.h" #include "hgTables.h" #include "wikiTrack.h" #include "makeItemsItem.h" #include "bedDetail.h" #include "pgSnp.h" #include "barChartBed.h" #include "interact.h" #include "hubConnect.h" +#include "trackHub.h" #include "errCatch.h" static char *nbForNothing(char *val) /* substitute for empty strings to keep table formating sane */ { char *s = skipLeadingSpaces(val); if ((s == NULL) || (s[0] == '\0')) return " "; else return val; } static char *abbreviateInPlace(char *val, int len) /* Abbreviate a string to len characters. */ { @@ -754,35 +755,35 @@ return TRUE; } } return FALSE; } void doSchema(struct sqlConnection *conn) /* Show schema around current track. */ { if (curTrackDescribesCurTable()) { char *table = connectingTableForTrack(curTable); if (!isCustomTrack(table) && !hashFindVal(fullTableToTdbHash, table)) hashAdd(fullTableToTdbHash, table, curTrack); htmlOpen("Schema for %s - %s", curTrack->shortLabel, curTrack->longLabel); - showSchema(database, curTrack, table); + showSchema(trackHubSkipHubName(database), curTrack, table); htmlClose(); } else - doTableSchema(database, curTable, conn); + doTableSchema(trackHubSkipHubName(database), curTable, conn); } struct asObject *asForTableNoTdb(struct sqlConnection *conn, char *table) /* Get autoSQL description if any associated with table. Don't try tdb */ { // Some cases are for tables with no tdb! struct asObject *asObj = NULL; if (sqlTableExists(conn, "tableDescriptions")) { struct errCatch *errCatch = errCatchNew(); if (errCatchStart(errCatch)) { char query[256]; sqlSafef(query, sizeof(query),