bba925c6dddbab2de7a7c6a2c073ebb8ffc70ebc
larrym
  Mon Jul 19 00:55:09 2010 -0700
refactor some code into lib/searchTracks.c and some code-review changes
diff --git src/hg/hgTracks/searchTracks.c src/hg/hgTracks/searchTracks.c
index 17cef66..4da6e51 100644
--- src/hg/hgTracks/searchTracks.c
+++ src/hg/hgTracks/searchTracks.c
@@ -1,6 +1,7 @@
 /* Track search code used by hgTracks CGI */
 
 #include "common.h"
+#include "searchTracks.h"
 #include "hCommon.h"
 #include "memalloc.h"
 #include "obscure.h"
@@ -201,8 +202,8 @@
 char **metadataValue;
 struct hash *parents = newHash(4);
 boolean simpleSearch;
-struct trix *ix;
-char ixFile[HDB_MAX_PATH_STRING];
+struct trix *trix;
+char trixFile[HDB_MAX_PATH_STRING];
 char **descWords = NULL;
 int descWordCount = 0;
 
@@ -219,8 +220,8 @@
     simpleSearch = FALSE;
     }
 
-safef(ixFile, sizeof(ixFile), "/gbdb/%s/trackDb.ix", database);
-ix = trixOpen(ixFile);
+getSearchTrixFile(database, trixFile, sizeof(trixFile));
+trix = trixOpen(trixFile);
 getTrackList(&groupList, -2);
 slSort(&groupList, gCmpGroup);
 for (group = groupList; group != NULL; group = group->next)
@@ -397,7 +398,7 @@
                     hashAdd(trackHash, subTrack->track, subTrack);
                 }
             }
-        for(tsList = trixSearch(ix, descWordCount, descWords, TRUE); tsList != NULL; tsList = tsList->next)
+        for(tsList = trixSearch(trix, descWordCount, descWords, TRUE); tsList != NULL; tsList = tsList->next)
             {
             struct track *track = (struct track *) hashFindVal(trackHash, tsList->itemId);
             refAdd(&tracks, track);