f0d475ddc991cec778b896f0621b5bfa75cc7d55 angie Thu Sep 26 16:39:12 2019 -0700 bigBedFind: support searchIndex in the search spec (not just trackDb); default to name if there is an index on name; support padding. refs #23283 Calling addHighlight from bigBedFind caused a lot of utils (e.g. hgTrackDb) to get linker errors about functions in hgFind.c that reference a global cart, so I made cart a param instead of a global in hgFind.c. diff --git src/hg/inc/hgFind.h src/hg/inc/hgFind.h index f932597..9ddacbd 100644 --- src/hg/inc/hgFind.h +++ src/hg/inc/hgFind.h @@ -58,25 +58,31 @@ /* A list of positions. */ { struct hgPos *next; /* Next in list. */ char *chrom; /* Chromosome. Not allocated here. */ int chromStart; /* Start position in chromosome. */ int chromEnd; /* End position in chromosome. */ char *name; /* Name of position - one word. */ char *description; /* Position description - a sentence or so. */ char *browserName; /* name as in hgTracks tg->itemName(). */ bool canonical; /* The gene is the canonical version. */ struct tsrPos *tp; /* The trix search associated with the gene. */ char *highlight; /* If non-empty, new value for highlight cart variable */ }; -void hgPositionsHelpHtml(char *organism, char *database); +void hgPositionsHelpHtmlCart(struct cart *cart, char *organism, char *database); /* Display contents of dbDb.htmlPath for database, or print an HTML comment * explaining what's missing. */ +#define hgPositionsHelpHtml(o, d) hgPositionsHelpHtmlCart(cart, o, d) -char *hCarefulTrackOpenVis(char *db, char *trackName); +char *hCarefulTrackOpenVisCart(struct cart *cart, char *db, char *trackName); /* If track is already in full mode, return full; otherwise, return * hTrackOpenVis. */ +#define hCarefulTrackOpenVis(d, t) hCarefulTrackOpenVisCart(cart, d, t) + +char *addHighlight(char *db, char *chrom, unsigned start, unsigned end); +/* Return a string that can be assigned to the cart var addHighlight, to add a yellow highlight + * at db.chrom:start+1-end for search results. */ #endif /* HGFIND_H */