2f75f45421c4854066f7572ac8a9f52e09068f29
kate
  Fri May 22 15:06:37 2015 -0700
1. Add -test option to use genome-test spec file.  2. Remove unneeded errCatch (from code review).  3. Simplify code org (delibify unshared code); bye to lib/trackHubCheck.c. refs #10015

diff --git src/hg/inc/trackHub.h src/hg/inc/trackHub.h
index a0ec3bb..8ef9366 100644
--- src/hg/inc/trackHub.h
+++ src/hg/inc/trackHub.h
@@ -53,58 +53,30 @@
     {
     struct trackHubGenome *next;
     char *name;	/* Something like hg18 or mm9, a UCSC assembly database name. */
     char *trackDbFile;	/* The base trackDb.ra file. */
     struct hash *settingsHash;	/* Settings from hub.ra file. */
     char *twoBitPath;  /* URL to twoBit.  If not null, this is an assmebly hub*/
     struct twoBitFile *tbf;  /* open handle to two bit file */
     char *groups;	     /* URL to group.txt file */
     char *defaultPos;        /* default position */
     char *organism;          /* organism name, like Human */
     char *description;       /* description, also called freeze name */
     struct trackHub *trackHub; /* associated track hub */
     unsigned orderKey;   /* the orderKey for changing the order from the order in the file */
     };
 
-struct trackHubCheckOptions
-/* How to check track hub */
-    {
-    boolean checkFiles;         /* check remote files exist and are correct type */
-    boolean checkSettings;      /* check trackDb settings to spec */
-    char *version;              /* hub spec version to check */
-    boolean strict;             /* check hub is valid to 'core' level for version */
-    char *extraFile;            /* name of extra file/url with additional settings to accept */
-    /* intermediate data */
-    struct hash *settings;      /* supported settings for this version */
-    struct hash *extra;         /* additional trackDb settings to accept */
-    struct slName *suggest;     /* list of supported settings for suggesting */
-    };
-
-struct trackHubSetting
-/* Setting name and support level, from trackDbHub.html (the spec) */
-    {
-    struct trackHubSetting *next;
-    char *name;                 /* setting name */
-    char *level;                /* support level (core, full, new, deprecated) */
-    };
-
-struct trackHubSetting *trackHubSettingsForVersion(char *version);
-/* Return list of settings with support level */
-
-char *trackHubVersionDefault();
-/* Return current hub version */
-
 void trackHubClose(struct trackHub **pHub);
 /* Close up and free resources from hub. */
 
 struct trackHub *trackHubOpen(char *url, char *hubName);
 /* Open up a track hub from url.  Reads and parses hub.ra and the genomesFile. 
  * The hubName is generally just the asciified ID number. */
 
 struct trackHubGenome *trackHubFindGenome(struct trackHub *hub, char *genomeName);
 /* Return trackHubGenome of given name associated with hub.  Return NULL if no
  * such genome. */
 
 struct trackDb *trackHubTracksForGenome(struct trackHub *hub, struct trackHubGenome *genome);
 /* Get list of tracks associated with genome.  Check that it only is composed of legal
  * types.  Do a few other quick checks to catch errors early. */
 
@@ -121,36 +93,30 @@
 
 char *trackHubRequiredSetting(struct trackHub *hub, char *name);
 /* Return named setting.  Abort with error message if not found. */
 
 char *trackHubRelativeUrl(char *hubUrl, char *path);
 /* Return full path (in URL form if it's a remote hub) given
  * path possibly relative to hubUrl. Do a freeMem of result
  * when done. */
 
 void trackHubGenomeFree(struct trackHubGenome **pGenome);
 /* Free up genome info. */
 
 void trackHubGenomeFreeList(struct trackHub *hub);
 /* Free a list of dynamically allocated trackHubGenome's. */
 
-int trackHubCheck(char *hubUrl, struct trackHubCheckOptions *options, struct dyString *errors);
-/* trackHubCheck - Check a track data hub for integrity. Put errors in dyString.
- *      if checkTracks is TRUE, individual tracks are checked
- *      if searchFp is non-null, then put search terms in there
- *      return 0 if hub has no errors, 1 otherwise */
-
 void trackHubPolishTrackNames(struct trackHub *hub, struct trackDb *tdbList);
 /* Remove all the special characters from trackHub track names. */
 
 char *trackHubCladeToGenome(char *clade);
 /* Given a track hub clade(hub name) return the default genome. */
 
 boolean trackHubDatabase(char *database);
 /* Is this an assembly from an Assembly Data hub? */
 
 char *trackHubDefaultChrom(char *database);
 /* Return the default chromosome for this track hub assembly. */
 
 char *trackHubAssemblyField(char *database, char *field);
 /* Get data field from a assembly data hub. */