64f10b4687eae05cf0f5ce9986b40c164d6ea8bc
hiram
  Tue Feb 14 11:31:03 2017 -0800
add description to searchTrix results refs #13673

diff --git src/hg/lib/bigBedFind.c src/hg/lib/bigBedFind.c
index 1ea129e..44b61a3 100644
--- src/hg/lib/bigBedFind.c
+++ src/hg/lib/bigBedFind.c
@@ -40,99 +40,107 @@
 /* Given a bigBed file with a search index, check for term. */
 {
 struct bbiFile *bbi = bigBedFileOpen(bigDataUrl);
 int fieldIx;
 struct bptFile *bpt = bigBedOpenExtraIndex(bbi, indexField, &fieldIx);
 struct lm *lm = lmInit(0);
 struct bigBedInterval *intervalList;
 intervalList = bigBedNameQuery(bbi, bpt, fieldIx, term, lm);
 
 struct hgPos *posList = bigBedIntervalListToHgPositions(bbi, term, 
     intervalList, description);
 bbiFileClose(&bbi);
 return posList;
 }
 
-static struct hgPos *doTrixSearch(char *trixFile, struct slName  *indices, char *bigDataUrl, char *term)
+static struct hgPos *doTrixSearch(char *trixFile, struct slName  *indices, char *bigDataUrl, char *term, char *description)
 /* search a trix file in the "searchTrix" field of a bigBed trackDb */
 {
 struct trix *trix = trixOpen(trixFile);
 int trixWordCount = 0;
 char *tmp = cloneString(term);
 char *val = nextWord(&tmp);
 char *trixWords[128];
 
 while (val != NULL)
     {
     trixWords[trixWordCount] = strLower(val);
     trixWordCount++;
     if (trixWordCount == sizeof(trixWords)/sizeof(char*))
 	errAbort("exhausted space for trixWords");
 
     val = nextWord(&tmp);        
     }
 
 if (trixWordCount == 0)
     return NULL;
 
 struct trixSearchResult *tsList = trixSearch(trix, trixWordCount, trixWords, tsmExpand);
 struct hgPos *posList = NULL;
-char *description = NULL;   // we're not filling in this field at the moment
 for ( ; tsList != NULL; tsList = tsList->next)
     {
     struct slName *oneIndex = indices;
     for (; oneIndex; oneIndex = oneIndex->next)
 	{
 	struct hgPos *posList2 = getPosFromBigBed(bigDataUrl, oneIndex->name, tsList->itemId, description);
 
 	posList = slCat(posList, posList2);
 	}
     }
 
 return posList;
 }
 
 
-boolean findBigBedPosInTdbList(char *db, struct trackDb *tdbList, char *term, struct hgPositions *hgp)
+boolean findBigBedPosInTdbList(char *db, struct trackDb *tdbList, char *term, struct hgPositions *hgp, struct hgFindSpec *hfs)
 /* Given a list of trackDb entries, check each of them for a searchIndex */
 {
 struct trackDb *tdb;
 boolean found = FALSE;
 
 for(tdb=tdbList; tdb; tdb = tdb->next)
     {
     char *indexField = trackDbSetting(tdb, "searchIndex");
     char *fileName = NULL;
 
     if (isHubTrack(tdb->table))
 	fileName = trackDbSetting(tdb, "bigDataUrl");
     else
 	{
 	struct sqlConnection *conn = hAllocConnTrack(db, tdb);
 	fileName = bbiNameFromSettingOrTable(tdb, conn, tdb->table);
 	hFreeConn(&conn);
 	}
 
     if (!(indexField && fileName))
 	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)
-	posList1 = doTrixSearch(trixFile, indexList, fileName, term);
+	{
+	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);
+	}
 
     // 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;
 	AllocVar(table);