81e8b9cb578ac40b8cdd16e3ffa306b5b167d66f braney Sat Mar 18 12:30:15 2017 -0700 allow bigBed trix searches to work on GBDB by checking for hgdownload as well as local files diff --git src/hg/lib/bigBedFind.c src/hg/lib/bigBedFind.c index 44b61a3..ebaaf30 100644 --- src/hg/lib/bigBedFind.c +++ src/hg/lib/bigBedFind.c @@ -115,31 +115,31 @@ continue; struct slName *indexList = slNameListFromString(indexField, ','); struct hgPos *posList1 = NULL, *posList2 = NULL; char *trixFile = trackDbSetting(tdb, "searchTrix"); // if there is a trix file, use it to search for the term if (trixFile != NULL) { char buf[2048]; char *description = NULL; if (hfs && isNotEmpty(hfs->searchDescription)) truncatef(buf, sizeof(buf), "%s", hfs->searchDescription); else safef(buf, sizeof(buf), "%s", hfs->searchTable); description = cloneString(buf); - posList1 = doTrixSearch(trixFile, indexList, fileName, term, description); + posList1 = doTrixSearch(hReplaceGbdb(trixFile), indexList, fileName, term, description); } // now search for the raw id's struct slName *oneIndex=indexList; for (; oneIndex; oneIndex = oneIndex->next) { posList2 = getPosFromBigBed(fileName, oneIndex->name, term, NULL); posList1 = slCat(posList1, posList2); } if (posList1 != NULL) { struct hgPosTable *table; found = TRUE;