d2429b17bb096f6c406a2ae03fb5593f27fa53c1 hiram Mon Mar 18 14:17:07 2019 -0700 hash up the output properly for hubPublic and dbDb outputs refs #18869 diff --git src/hg/hubApi/dataApi.h src/hg/hubApi/dataApi.h index 6b07046..9bafaff 100644 --- src/hg/hubApi/dataApi.h +++ src/hg/hubApi/dataApi.h @@ -59,32 +59,33 @@ struct slName *genomeList(struct trackHub *hubTop, struct trackDb **dbTrackList, char *selectGenome); /* follow the pointers from the trackHub to trackHubGenome and around * in a circle from one to the other to find all hub resources * return slName list of the genomes in this track hub * optionally, return the trackList from this hub for the specified genome */ /* functions in apiUtils.c */ void apiErrAbort(char *format, ...); /* Issue an error message in json format, and exit(0) */ struct jsonWrite *apiStartOutput(); /* begin json output with standard header information for all requests */ -int tableColumns(struct sqlConnection *conn, struct jsonWrite *jw, char *table); -/* output the column names, and their MySQL data type, for the given table +int tableColumns(struct sqlConnection *conn, struct jsonWrite *jw, char *table, + char ***nameReturn, char ***typeReturn); +/* return the column names, and their MySQL data type, for the given table * return number of columns (aka 'fields') */ struct trackHub *errCatchTrackHubOpen(char *hubUrl); /* use errCatch around a trackHub open in case it fails */ struct trackDb *obtainTdb(struct trackHubGenome *genome, char *db); /* return a full trackDb fiven the hub genome pointer, or ucsc database name */ /* ######################################################################### */ /* functions in getData.c */ void apiGetData(char *words[MAX_PATH_INFO]); /* 'getData' function, words[1] is the subCommand */