c619e81ea0e474c84e25c06992b98e3716216cf9 kate Wed Aug 2 10:32:59 2017 -0700 Easier sandbox support. diff --git src/hg/hgGtexTrackSettings/hgGtexTrackSettings.c src/hg/hgGtexTrackSettings/hgGtexTrackSettings.c index 3ed2e70..ccbe5fe 100644 --- src/hg/hgGtexTrackSettings/hgGtexTrackSettings.c +++ src/hg/hgGtexTrackSettings/hgGtexTrackSettings.c @@ -389,38 +389,39 @@ puts( " </div>\n" " </div>\n"); } static struct trackDb *getTrackDb(char *db, char *track) /* Check if this is an assembly with GTEx track and get trackDb */ { struct sqlConnection *conn = sqlConnect(db); if (conn == NULL) errAbort("Can't connect to database %s\n", db); char where[256]; safef(where, sizeof(where), "tableName='%s'", track); // WARNING: this will break in sandboxes unless trackDb entry is pushed to hgwdev. // The fix of using hTrackDbList() would slow for all users, so leaving as is. -struct trackDb *tdb = trackDbLoadWhere(conn, "trackDb", where); +#define TRACKDB "trackDb" +struct trackDb *tdb = trackDbLoadWhere(conn, TRACKDB, where); trackDbAddTableField(tdb); char *parent = trackDbLocalSetting(tdb, "parent"); struct trackDb *parentTdb; if (parent) { safef(where, sizeof(where), "tableName='%s'", parent); - parentTdb = trackDbLoadWhere(conn, "trackDb", where); + parentTdb = trackDbLoadWhere(conn, TRACKDB, where); if (parentTdb) tdb->parent = parentTdb; } sqlDisconnect(&conn); return tdb; } static void doMiddle(struct cart *theCart) /* Send HTML with javascript to display the user interface. */ { cart = theCart; char *db = NULL, *genome = NULL, *clade = NULL; getDbGenomeClade(cart, &db, &genome, &clade, oldVars); database = db;