bcf1004e0ab1faed65f32f2dc399fd539fb5aa34 braney Sat Apr 24 12:25:03 2021 -0700 Revert "make hubApi use the trackDb cache." This reverts commit da0932abedd063b6e9fe087bc26ab9ef53b6cd2e. diff --git src/hg/inc/trackHub.h src/hg/inc/trackHub.h index 5f56b06..73ff133 100644 --- src/hg/inc/trackHub.h +++ src/hg/inc/trackHub.h @@ -10,31 +10,30 @@ * are in a subset of the usual trackDb format. * How you use the routines here most commonly is as so: * struct trackHub *hub = trackHubOpen(hubRaUrl); * struct trackHubGenome *hubGenome = trackHubFindGenome(hub, "hg19"); * struct trackDb *tdbList = trackHubTracksForGenome(hub, hubGenome); * // do something with tdbList * trackHubClose(&hub); * Note that the tdbList returned does not have the parent/subtrack pointers set. * It is just a simple list of tracks, not a tree. */ #ifndef TRACKHUB_H #define TRACKHUB_H #include "dystring.h" -#include "hgFind.h" #define MAX_HUB_TRACKDB_FILE_SIZE 64*1024*1024 #define MAX_HUB_GROUP_FILE_SIZE 16*1024*1024 #define MAX_HUB_GENOME_FILE_SIZE 64*1024*1024 struct trackHub /* A track hub. */ { struct trackHub *next; struct hubConnectStatus *hubStatus; /* Pointer to our hubConnectStatus structure, if any. */ char *url; /* URL of hub.ra file. */ struct trackHubGenome *genomeList; /* List of associated genomes. */ struct hash *genomeHash; /* Hash of genomeList keyed by genome name. */ @@ -211,20 +210,17 @@ /* Given a trackHub (list of) track hub dbDb which may be missing some info, * return an slPair of value and label suitable for making a select/menu option. */ void hubCheckBigDataUrl(struct trackHub *hub, struct trackHubGenome *genome, struct trackDb *tdb); /* Check remote file exists and is of correct type. Wrap this in error catcher */ struct dbDb *trackHubGetPcrServers(); /* Look through attached trackHubs to see which of them have "isPcr" line in them. */ boolean trackHubGetPcrParams(char *database, char **pHost, char **pPort, char **pGenomeDataDir); /* Get the isPcr params from a trackHub genome. */ struct trackHubGenome *trackHubGetGenomeUndecorated(char *database); /* Get the genome structure for an undecorated genome name. */ - -struct trackDb *trackHubAddTracksGenome(struct trackHubGenome *hubGenome); -/* Load up stuff from data hub and return list. */ #endif /* TRACKHUB_H */