3ada7f009d11ce5c390942bc207b40ec538c5279 kate Sun May 17 23:42:43 2015 -0700 Add checkSettings option to hubCheck instead of having setting check be default. This is to maintain current behavior for initial release. Also hide version options for now (they are in additional -help). refs #10015 diff --git src/hg/inc/trackHub.h src/hg/inc/trackHub.h index 646d324..a0ec3bb 100644 --- src/hg/inc/trackHub.h +++ src/hg/inc/trackHub.h @@ -56,33 +56,34 @@ 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 */ - boolean checkFiles; /* check remote files exist and are correct type */ 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) */ };