c3bb5a0e0757e2f66a06395b05fc78a7f2957e87 hiram Fri Mar 23 11:34:33 2018 -0700 manage dataVersion trackDb setting in conjuction with hgFixed.trackVersion table refs #20215 diff --git src/hg/hgTracks/simpleTracks.c src/hg/hgTracks/simpleTracks.c index 9c7b36d..9161212 100644 --- src/hg/hgTracks/simpleTracks.c +++ src/hg/hgTracks/simpleTracks.c @@ -132,30 +132,31 @@ #endif /* GBROWSE */ #ifdef LOWELAB #include "loweLabTracks.h" #include "rnaPLFoldTrack.h" #endif /* LOWELAB */ #ifdef LOWELAB_WIKI #include "wiki.h" #endif /* LOWELAB_WIKI */ #include "trackVersion.h" #include "genbank.h" #include "bedTabix.h" #include "knetUdc.h" #include "trackHub.h" +#include "hubConnect.h" #define CHROM_COLORS 26 /* Declare our color gradients and the the number of colors in them */ Color shadesOfGreen[EXPR_DATA_SHADES]; Color shadesOfRed[EXPR_DATA_SHADES]; Color shadesOfBlue[EXPR_DATA_SHADES]; Color shadesOfYellow[EXPR_DATA_SHADES]; Color shadesOfGreenOnWhite[EXPR_DATA_SHADES]; Color shadesOfRedOnWhite[EXPR_DATA_SHADES]; Color shadesOfBlueOnWhite[EXPR_DATA_SHADES]; Color shadesOfYellowOnWhite[EXPR_DATA_SHADES]; Color shadesOfRedOnYellow[EXPR_DATA_SHADES]; Color shadesOfBlueOnYellow[EXPR_DATA_SHADES]; Color orangeColor = 0; @@ -14312,35 +14313,45 @@ struct trackVersion *trackVersion = getTrackVersion(database, "ensGene"); if ((trackVersion != NULL) && !isEmpty(trackVersion->version)) { char longLabel[256]; if (!isEmpty(trackVersion->dateReference) && differentWord("current", trackVersion->dateReference)) safef(longLabel, sizeof(longLabel), "Ensembl Gene Predictions - archive %s - %s", trackVersion->version, trackVersion->dateReference); else safef(longLabel, sizeof(longLabel), "Ensembl Gene Predictions - %s", trackVersion->version); track->longLabel = cloneString(longLabel); } else track->longLabel = cloneString(tdb->longLabel); } else if (startsWith("ncbiRef", tdb->track)) { + char *version = checkDataVersion(database, tdb); + + // if not in that file, check the trackVersion table + if (version == NULL) + { struct trackVersion *trackVersion = getTrackVersion(database, "ncbiRefSeq"); if ((trackVersion != NULL) && !isEmpty(trackVersion->version)) { + version = cloneString(trackVersion->version); + } + } + if (version) + { char longLabel[1024]; - safef(longLabel, sizeof(longLabel), "%s - Annotation Release %s", tdb->longLabel, trackVersion->version); + safef(longLabel, sizeof(longLabel), "%s - Annotation Release %s", tdb->longLabel, version); track->longLabel = cloneString(longLabel); tdb->longLabel = cloneString(longLabel); } else track->longLabel = cloneString(tdb->longLabel); } else track->longLabel = cloneString(tdb->longLabel); track->color.r = tdb->colorR; track->color.g = tdb->colorG; track->color.b = tdb->colorB; track->altColor.r = tdb->altColorR; track->altColor.g = tdb->altColorG; track->altColor.b = tdb->altColorB; track->lineHeight = tl.fontHeight+1;