3c68ae03c7ec7a7e6b98c22e81f7a6489b50e515 braney Mon Feb 17 10:41:18 2020 -0800 delete long unused code for HIV, Cancer browser. RIP Fan. diff --git src/hg/hgTracks/wigMafTrack.c src/hg/hgTracks/wigMafTrack.c index 0c1a1b4..600aedd 100644 --- src/hg/hgTracks/wigMafTrack.c +++ src/hg/hgTracks/wigMafTrack.c @@ -155,72 +155,56 @@ } struct wigMafItem *newSpeciesItems(struct track *track, int height) /* Make up item list for all species configured in track settings */ { char *species[MAX_SP_SIZE]; char *groups[20]; char *defaultOff[MAX_SP_SIZE]; char sGroup[MAX_SP_SIZE]; int group; int i; int speciesCt = 0, groupCt = 1; int speciesOffCt = 0; struct hash *speciesOffHash = newHash(0); char *speciesUseFile = trackDbSetting(track->tdb, SPECIES_USE_FILE); -char *msaTable = NULL; /* either speciesOrder or speciesGroup is specified in trackDb */ char *speciesOrder = trackDbSetting(track->tdb, SPECIES_ORDER_VAR); char *speciesGroup = trackDbSetting(track->tdb, SPECIES_GROUP_VAR); char *speciesOff = trackDbSetting(track->tdb, SPECIES_DEFAULT_OFF_VAR); bool lowerFirstChar = TRUE; char *firstCase; firstCase = trackDbSetting(track->tdb, ITEM_FIRST_CHAR_CASE); if (firstCase != NULL) { if (sameWord(firstCase, "noChange")) lowerFirstChar = FALSE; } if (speciesOrder == NULL && speciesGroup == NULL && speciesUseFile == NULL) return getSpeciesFromMaf(track, height); if (speciesGroup) groupCt = chopLine(cloneString(speciesGroup), groups); if (speciesUseFile) { if ((speciesGroup != NULL) || (speciesOrder != NULL)) errAbort("Can't specify speciesUseFile and speciesGroup or speciesOrder"); - if (hIsGsidServer()) - { - msaTable = trackDbSetting(track->tdb, "msaTable"); - if (msaTable != NULL) - { - speciesOrder = cartGetOrderFromFileAndMsaTable(database, cart, speciesUseFile, msaTable); - } - else - { speciesOrder = cartGetOrderFromFile(database, cart, speciesUseFile); - } - } - else - { - speciesOrder = cartGetOrderFromFile(database, cart, speciesUseFile); - } speciesOff = NULL; } /* keep track of species configured off initially for track */ if (speciesOff) { speciesOffCt = chopLine(cloneString(speciesOff), defaultOff); for (i = 0; i < speciesOffCt; i++) hashAdd(speciesOffHash, defaultOff[i], NULL); } /* Make up items for other organisms by scanning through group & species track settings */ struct wigMafItem *mi = NULL, *miList = NULL; for (group = 0; group < groupCt; group++)