ba87d8471c9c78f15412ccad2aaba9b46d1af38e hiram Tue Jul 2 16:14:47 2024 -0700 eliminte the dependency upon specific genArk genome names, use the genark table for questions about existence, refs #32596 diff --git src/hg/hubApi/dataApi.h src/hg/hubApi/dataApi.h index 81a0e47..38b413b 100644 --- src/hg/hubApi/dataApi.h +++ src/hg/hubApi/dataApi.h @@ -28,33 +28,30 @@ #include "bamFile.h" #include "jsonParse.h" #include "jsonWrite.h" #include "chromInfo.h" #include "wiggle.h" #include "hubPublic.h" #include "cartTrackDb.h" #include "chromAlias.h" #include "pipeline.h" #include "genark.h" #ifdef USE_HAL #include "halBlockViz.h" #endif -/* test name for matching a GenArk hub genome name */ -#define isGenArk(name) (startsWith("GCA_", name) || startsWith("GCF_", name)) - /* reference for these error codes: * https://www.restapitutorial.com/httpstatuscodes.html */ /* error return codes */ #define err206 206 #define err206Msg "Partial Content" #define err301 301 #define err301Msg "Moved Permanently" #define err400 400 #define err400Msg "Bad Request" #define err403 403 #define err403Msg "Forbidden" #define err404 404 #define err404Msg "Not Found" #define err415 415 @@ -244,39 +241,30 @@ #define trackHasNoData(tdb) (!trackHasData(tdb)) boolean protectedTrack(char *db, struct trackDb *tdb, char *trackName); /* determine if track is off-limits protected data */ boolean isWiggleDataTable(char *type); /* is this a wiggle data track table */ char *chrOrAlias(char *db, char *hubUrl); /* get incoming chr name, may be an alias, return the native chr name */ void hubAliasSetup(struct trackHubGenome *hubGenome); /* see if this hub has an alias file and run chromAliasSetupBb() for it */ -char *genArkPath(char *genome); -/* given a GenArk hub genome name, e.g. GCA_021951015.1 return the path: - * GCA/021/951/015/GCA_021951015.1 - * prefix that with desired server URL: https://hgdownload.soe.ucsc.edu/hubs/ - * if desired. Or suffix add /hub.txt to get the hub.txt URL - * - * already been proven that genome is a GCx_ name prefix before calling - */ - void textLineOut(char *lineOut); /* accumulate text lines for output in the dyString textOutput */ void textFinishOutput(); /* all done with text output, print it all out */ /* ######################################################################### */ /* functions in getData.c */ void apiGetData(char *words[MAX_PATH_INFO]); /* 'getData' function, words[1] is the subCommand */ /* ######################################################################### */ /* functions in list.c */