3b48412a1e8b3124093c30330c3730e4e4522ca0 braney Sun Sep 2 13:01:35 2018 -0700 libify custom bigbed labels so they can be used in hgFind reports #21963 diff --git src/hg/lib/hgFind.c src/hg/lib/hgFind.c index 313a307..9559701 100644 --- src/hg/lib/hgFind.c +++ src/hg/lib/hgFind.c @@ -2607,31 +2607,31 @@ static boolean isBigFileFind(struct hgFindSpec *hfs) /* is this a find on a big* file? */ { return sameString(hfs->searchType, "bigBed") || sameString(hfs->searchType, "bigPsl") || sameString(hfs->searchType, "bigBarChart") || sameString(hfs->searchType, "bigGenePred"); } static boolean findBigBed(char *db, struct hgFindSpec *hfs, char *spec, struct hgPositions *hgp) /* Look up items in bigBed */ { struct trackDb *tdb = tdbFindOrCreate(db, NULL, hfs->searchTable); -return findBigBedPosInTdbList(db, tdb, spec, hgp, hfs); +return findBigBedPosInTdbList(cart, db, tdb, spec, hgp, hfs); } static boolean searchSpecial(char *db, struct hgFindSpec *hfs, char *term, int limitResults, struct hgPositions *hgp, boolean relativeFlag, int relStart, int relEnd, boolean *retFound) /* Handle searchTypes for which we have special code. Return true if * we have special code. Set retFind according to whether we find term. */ { boolean isSpecial = TRUE; boolean found = FALSE; char *upcTerm = cloneString(term); touppers(upcTerm); if (sameString(hfs->searchType, "knownGene")) { if (gotFullText(db)) @@ -3237,31 +3237,31 @@ break; } } if (! done) { for (hfs = longList; hfs != NULL; hfs = hfs->next) { hgFindUsingSpec(db, hfs, term, limitResults, hgp, relativeFlag, relStart, relEnd, multiTerm); } /* Lowe lab additions -- would like to replace these with specs, but * will leave in for now. */ if (!trackHubDatabase(db)) findTigrGenes(db, term, hgp); - trackHubFindPos(db, term, hgp); + trackHubFindPos(cart, db, term, hgp); } hgFindSpecFreeList(&shortList); hgFindSpecFreeList(&longList); if (cart != NULL) { if(hgpMatchNames == NULL) hgpMatchNames = newDyString(256); dyStringClear(hgpMatchNames); int matchCount = 0; for(hgpItem = hgp; hgpItem != NULL; hgpItem = hgpItem->next) { struct hgPosTable *hpTable = NULL; for(hpTable = hgpItem->tableList; hpTable != NULL; hpTable = hpTable->next) { struct hgPos *pos = NULL;