b7749ec648f88880da646bca0bba1a14f288639c hiram Wed Mar 20 18:13:15 2019 -0700 adding hubPublic.c and .h to library refs #18869 diff --git src/hg/hubApi/dataApi.h src/hg/hubApi/dataApi.h index d9608f6..76fe829 100644 --- src/hg/hubApi/dataApi.h +++ src/hg/hubApi/dataApi.h @@ -18,53 +18,40 @@ #include "trackHub.h" #include "hgConfig.h" #include "hCommon.h" #include "hPrint.h" #include "bigWig.h" #include "hubConnect.h" #include "obscure.h" #include "errCatch.h" #include "vcf.h" #include "bedTabix.h" #include "bamFile.h" #include "jsonParse.h" #include "jsonWrite.h" #include "chromInfo.h" #include "wiggle.h" +#include "hubPublic.h" #ifdef USE_HAL #include "halBlockViz.h" #endif -/*this definition should be over in hg/inc/hubPublic.h but that does not exist*/ -struct hubPublic -/* Table of public track data hub connections. */ - { - struct hubPublic *next; /* Next in singly linked list. */ - char *hubUrl; /* URL to hub.ra file */ - char *shortLabel; /* Hub short label. */ - char *longLabel; /* Hub long label. */ - char *registrationTime; /* Time first registered */ - unsigned dbCount; /* Number of databases hub has data for. */ - char *dbList; /* Comma separated list of databases. */ - char *descriptionUrl; /* URL to description HTML */ - }; - #define MAX_PATH_INFO 32 /* functions in hubApi.c */ -struct hubPublic *hubPublicLoadAll(); +struct hubPublic *hubPublicDbLoadAll(); struct dbDb *ucscDbDb(); /* return the dbDb table as an slList */ 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) */