d9601b7485629b07bca40a2ce6205b53b162aad2 braney Tue Dec 14 14:55:50 2010 -0800 add the ability to add a release tag(s) to include statements #452 diff --git src/hg/inc/trackDb.h src/hg/inc/trackDb.h index 96bed15..7fd520d 100644 --- src/hg/inc/trackDb.h +++ src/hg/inc/trackDb.h @@ -281,31 +281,31 @@ #define trackDbCommaOut(el,f) trackDbOutput(el,f,',',','); /* Print out trackDb as a comma separated list including final comma. */ /* ----------- End of AutoSQL generated code --------------------- */ struct trackDb *trackDbNew(); /* Allocate a new trackDb with just very minimal stuff filled in. */ int trackDbCmp(const void *va, const void *vb); /* Sort track by priority. */ void trackDbOverridePriority(struct hash *tdHash, char *priorityRa); /* Override priority settings using a ra file. */ -struct trackDb *trackDbFromRa(char *raFile); +struct trackDb *trackDbFromRa(char *raFile, char *releaseTag); /* Load track info from ra file into list. */ void trackDbPolish(struct trackDb *bt); /* Fill in missing values with defaults. */ void trackDbFieldsFromSettings(struct trackDb *td); /* Update trackDb fields from settings hash */ char *trackDbLocalSetting(struct trackDb *tdb, char *name); /* Return setting from tdb, but *not* any of it's parents. */ struct hash *trackDbHashSettings(struct trackDb *tdb); /* Force trackDb to hash up it's settings. Usually this is just * done on demand. Returns settings hash. */ @@ -334,31 +334,31 @@ /* Find name of supertrack if this track is a member */ float trackDbFloatSettingOrDefault(struct trackDb *tdb, char *name, float defaultVal); /* Return setting, convert to a float, or defaultVal if none exists */ void trackDbSuperMemberSettings(struct trackDb *tdb); /* Set fields in trackDb to indicate this is a member of a * supertrack. */ void trackDbSuperMarkup(struct trackDb *tdbList); /* Get info from supertrack setting. There are 2 forms: * Parent: 'supertrack on [show]' * Child: 'supertrack [vis] * Returns NULL if there is no such setting */ -char *trackDbInclude(char *raFile, char *line); +char *trackDbInclude(char *raFile, char *line, char **releaseTag); /* Get include filename from trackDb line. Return NULL if line doesn't contain include */ char *trackDbOrigAssembly(struct trackDb *tdb); /* return setting from trackDb, if any */ void trackDbPrintOrigAssembly(struct trackDb *tdb, char *database); /* Print lift information from trackDb, if any */ // Not all track types have separate configuration typedef enum _eCfgType { cfgNone =0, cfgBedScore =1, cfgWig =2, @@ -465,17 +465,20 @@ /* Do trackDbCmp on list of references as opposed to actual trackDbs. */ int trackDbCountDescendants(struct trackDb *tdb); /* Count the number of tracks in subtracks list and their subtracks too . */ int trackDbCountDescendantLeaves(struct trackDb *tdb); /* Count the number of leaves in children list and their children. */ struct trackDb *trackDbTopLevelSelfOrParent(struct trackDb *tdb); /* Look for a parent who is a composite or multiTrack track and return that. Failing that * just return self. */ boolean trackDbUpdateOldTag(char **pTag, char **pVal); /* Look for obscolete tags and update them to new format. Return TRUE if any update * is done. Will allocate fresh memory for new tag and val if updated. */ + +boolean trackDbCheckValidRelease(char *tag); +/* check to make sure release tag is valid */ #endif /* TRACKDB_H */