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/hgTrackUi/hgTrackUi.c src/hg/hgTrackUi/hgTrackUi.c index 0bbbc2c..5ca1fb0 100644 --- src/hg/hgTrackUi/hgTrackUi.c +++ src/hg/hgTrackUi/hgTrackUi.c @@ -3143,38 +3143,47 @@ struct trackVersion *trackVersion = getTrackVersion(database, tdb->track); if ((trackVersion != NULL) && !isEmpty(trackVersion->version)) { 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); } else safef(longLabel, sizeof(longLabel), "%s", tdb->longLabel); printf("<B style='font-size:200%%;'>%s%s</B>\n", longLabel, tdbIsSuper(tdb) ? " Tracks" : ""); } else if (sameWord(tdb->track, "refSeqComposite")) { - struct trackVersion *trackVersion = getTrackVersion(database, "ncbiRefSeq"); char longLabel[1024]; + char *version = checkDataVersion(database, tdb); + + if (version) + { + safef(longLabel, sizeof(longLabel), "%s - Annotation Release %s", tdb->longLabel, version); + } + else + { + struct trackVersion *trackVersion = getTrackVersion(database, "ncbiRefSeq"); if ((trackVersion != NULL) && !isEmpty(trackVersion->version)) { safef(longLabel, sizeof(longLabel), "%s - Annotation Release %s", tdb->longLabel, trackVersion->version); } else safef(longLabel, sizeof(longLabel), "%s", tdb->longLabel); + } printf("<B style='font-size:200%%;'>%s%s</B>\n", longLabel, tdbIsSuper(tdb) ? " Tracks" : ""); } else { if (trackDbSetting(tdb, "wgEncode")) printf("<A HREF='/ENCODE/index.html'><IMG style='vertical-align:middle;' " "width=100 src='/images/ENCODE_scaleup_logo.png'><A>"); // set large title font size, but less so for long labels to minimize wrap printf("<B style='font-size:%d%%;'>%s%s</B>\n", strlen(tdb->longLabel) > 30 ? 133 : 200, tdb->longLabel, tdbIsSuper(tdb) ? " Tracks" : ""); } /* Print link for parent track */ if (!ajax) {