76367141415738bfc83da601aeeeaf05d1eee04f chmalee Fri Jul 22 11:43:03 2022 -0700 When searching a bigBed track, search first the trix index if present, and then search on any bigBed indexes. Uniqify the results. Restores behaviour changed by my previous commit while still removing duplicates, refs #29685 diff --git src/hg/inc/hgFind.h src/hg/inc/hgFind.h index c685d21..c433ec4 100644 --- src/hg/inc/hgFind.h +++ src/hg/inc/hgFind.h @@ -58,30 +58,32 @@ struct hgPos /* 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 hgPosFree(struct hgPos **pEl); +/* Free up hgPos. */ 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 *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. */