9440548e67d816a02d14939e7114ab57a12f6965 braney Sat Apr 12 15:35:48 2014 -0700 first cut at writing out search terms from public hubs #11633 diff --git src/hg/inc/trackHub.h src/hg/inc/trackHub.h index 70790e9..b4e7f37 100644 --- src/hg/inc/trackHub.h +++ src/hg/inc/trackHub.h @@ -81,33 +81,35 @@ 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 trackHubGenome **pList); /* Free a list of dynamically allocated trackHubGenome's. */ -int trackHubCheck(char *hubUrl, struct dyString *errors, boolean checkTracks); +int trackHubCheck(char *hubUrl, struct dyString *errors, + boolean checkTracks, FILE *searchFp); /* 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); @@ -146,17 +148,21 @@ /* Change all characters other than alphanumeric, dash, and underbar * to underbar. */ struct grp *trackHubLoadGroups(char *database); /* Load the grp structures for this track hub database. */ char *trackHubSkipHubName(char *name); /* Skip the hub_#_ prefix in a hub name. */ struct dbDb *trackHubDbDbFromAssemblyDb(char *database); /* Return a dbDb structure for just this database. */ struct hgPositions; void trackHubFindPos(char *db, char *term, struct hgPositions *hgp); /* Look for term in track hubs. Update hgp if found */ + +void trackHubAddDescription(char *trackDbFile, struct trackDb *tdb); +/* Fetch tdb->track's html description (or nearest ancestor's non-empty description) + * and store in tdb->html. */ #endif /* TRACKHUB_H */