78dfd4b6e906a962da40780c799f92bb7ea1b3c1 kent Wed Jan 12 15:47:29 2011 -0800 Starting to integrate data hub into table browser. Still problems, so effectively is commented out at the moment. diff --git src/hg/hgTables/hgTables.h src/hg/hgTables/hgTables.h index 4a082e3..be8396c 100644 --- src/hg/hgTables/hgTables.h +++ src/hg/hgTables/hgTables.h @@ -31,30 +31,32 @@ int end; /* Non-inclusive. */ boolean fullChrom; /* If TRUE it's full chromosome. */ char *name; /* possibly the encode region name */ }; /* Global variables - generally set during initialization and then read-only. */ extern struct cart *cart; /* This holds cgi and other variables between clicks. */ extern struct hash *oldVars; /* The cart before new cgi stuff added. */ extern char *genome; /* Name of genome - mouse, human, etc. */ extern char *database; /* Current database, often but not always dbDatabase. */ extern char *freezeName; /* Date of assembly. */ extern struct trackDb *fullTrackList; /* List of all tracks in database. */ extern struct hash *fullTrackHash; /* Hash of tracks in fullTrackList keyed by ->track field. */ extern struct trackDb *forbiddenTrackList; /* List of tracks with 'tableBrowser off' setting. */ extern struct trackDb *curTrack; /* Currently selected track. */ +extern struct grp *fullGroupList; /* List of all groups. */ +extern struct grp *curGroup; /* Currently selected group. */ extern struct customTrack *theCtList; /* List of custom tracks. */ extern char *curTable; /* Current selected table. */ struct joiner *allJoiner; /* Info on how to join tables. */ /* --------------- HTML Helpers ----------------- */ void hPrintSpaces(int count); /* Print a number of non-breaking spaces. */ void writeHtmlCell(char *text); /* Write out a cell in an HTML table, making text not too big, * and stripping html tags and breaking spaces.... */ void htmlOpen(char *format, ...); /* Start up a page that will be in html format. */ @@ -127,33 +129,30 @@ char *getRegionName(); /* Get a name for selected region. Don't free this. */ boolean fullGenomeRegion(); /* Return TRUE if region is full genome. */ struct sqlResult *regionQuery(struct sqlConnection *conn, char *table, char *fields, struct region *region, boolean isPositional, char *extraWhere); /* Construct and execute query for table on region. */ void dbOverrideFromTable(char buf[256], char **pDb, char **pTable); /* If *pTable includes database, overrider *pDb with it, using * buf to hold string. */ -struct grp *makeGroupList(struct trackDb *trackList, boolean allTablesOk); -/* Get list of groups that actually have something in them. */ - struct grp *findSelectedGroup(struct grp *groupList, char *cgiVar); /* Find user-selected group if possible. If not then * go to various levels of defaults. */ struct slName *tablesForTrack(struct trackDb *track, boolean useJoiner); /* Return list of all tables associated with track. */ struct trackDb *findSelectedTrack(struct trackDb *trackList, struct grp *group, char *varName); /* Find selected track - from CGI variable if possible, else * via various defaults. */ struct trackDb *findTrack(char *name, struct trackDb *trackList); /* Find track, or return NULL if can't find it. */