46602c2943cc6fc5ff04408e586d2adbfbd38d02 tdreszer Mon Oct 11 12:49:31 2010 -0700 Trix is in /gbdb/ so must have separate name for beta version in order to avoid beta stepping on RR. This is done by a different name for the beta files and an hg.conf setting for beta. diff --git src/hg/lib/searchTracks.c src/hg/lib/searchTracks.c index 45f4461..bc3705a 100644 --- src/hg/lib/searchTracks.c +++ src/hg/lib/searchTracks.c @@ -1,23 +1,25 @@ // Track Search code which is shared between different CGIs #include "searchTracks.h" #include "hdb.h" +#include "hgConfig.h" #include "trix.h" void getSearchTrixFile(char *database, char *buf, int len) // Fill-in the name of the track search trix file { -safef(buf, len, "/gbdb/%s/trackDb.ix", database); +char *fileName = cfgOptionDefault("browser.trixFile", "trackDb.ix"); +safef(buf, len, "/gbdb/%s/%s", database,fileName); } boolean isSearchTracksSupported(char *database) // Return TRUE if searchTracks is supported for this database { #ifdef TRACK_SEARCH char trixFile[HDB_MAX_PATH_STRING]; getSearchTrixFile(database, trixFile, sizeof(trixFile)); return fileExists(trixFile); #else return FALSE; #endif }