371fc634183b94991d7c546a9043caab8c84222f kent Tue Feb 1 15:13:38 2011 -0800 Making big bed all field output work in hubs. diff --git src/hg/hgTables/hgTables.c src/hg/hgTables/hgTables.c index 591b585..0c1c639 100644 --- src/hg/hgTables/hgTables.c +++ src/hg/hgTables/hgTables.c @@ -597,31 +597,31 @@ hti->type = cloneString(tdb->type); } return hti; } struct hTableInfo *maybeGetHti(char *db, char *table, struct sqlConnection *conn) /* Return primary table info, but don't abort if table not there. Conn should be open to db. */ { struct hTableInfo *hti = NULL; if (isHubTrack(table)) { struct trackDb *tdb = hashMustFindVal(fullTrackAndSubtrackHash, table); hti = hubTrackTableInfo(tdb); } -else if (hIsBigBed(database, table, curTrack, ctLookupName)) +else if (isBigBed(database, table, curTrack, ctLookupName)) { hti = bigBedToHti(table, conn); } else if (isCustomTrack(table)) { struct customTrack *ct = ctLookupName(table); hti = ctToHti(ct); } else if (sameWord(table, WIKI_TRACK_TABLE)) { hti = wikiHti(); } else { char *track; @@ -1326,47 +1326,47 @@ if (!isPositional) break; /* No need to iterate across regions in this case. */ freez(&filter); } /* Do some error diagnostics for user. */ if (outCount == 0) explainWhyNoResults(f); hashFree(&idHash); } void doTabOutTable( char *db, char *table, FILE *f, struct sqlConnection *conn, char *fields) /* Do tab-separated output on fields of a single table. */ { -if (hIsBigBed(database, table, curTrack, ctLookupName)) +if (isBigBed(database, table, curTrack, ctLookupName)) bigBedTabOut(db, table, conn, fields, f); else if (isCustomTrack(table)) { doTabOutCustomTracks(db, table, conn, fields, f); } else doTabOutDb(db, db, table, table, f, conn, fields); } struct slName *fullTableFields(char *db, char *table) /* Return list of fields in db.table.field format. */ { char dtBuf[256]; struct sqlConnection *conn; struct slName *fieldList = NULL, *dtfList = NULL, *field, *dtf; -if (hIsBigBed(database, table, curTrack, ctLookupName)) +if (isBigBed(database, table, curTrack, ctLookupName)) { conn = hAllocConn(db); fieldList = bigBedGetFields(table, conn); hFreeConn(&conn); } else if (isCustomTrack(table)) { struct customTrack *ct = ctLookupName(table); char *type = ct->dbTrackType; if (type != NULL) { conn = hAllocConn(CUSTOM_TRASH); if (startsWithWord("maf", type) || startsWithWord("makeItems", type) || sameWord("bedDetail", type) || sameWord("pgSnp", type)) fieldList = sqlListFields(conn, ct->dbTableName); hFreeConn(&conn);