eb8f9cd9e8dddf195e6d48f5d2bb27da27214326
larrym
Tue May 29 15:59:03 2012 -0700
use hgFixed.trackVersion.version (if available) for 'Data Version' (#8032)
diff --git src/hg/hgTrackUi/hgTrackUi.c src/hg/hgTrackUi/hgTrackUi.c
index 5b7f7aa..528e685 100644
--- src/hg/hgTrackUi/hgTrackUi.c
+++ src/hg/hgTrackUi/hgTrackUi.c
@@ -30,30 +30,31 @@
#include "dbRIP.h"
#include "tfbsConsSites.h"
#include "hapmapSnps.h"
#include "nonCodingUi.h"
#include "expRecord.h"
#include "wikiTrack.h"
#include "hubConnect.h"
#include "trackHub.h"
#include "pcrResult.h"
#include "dgv.h"
#include "transMapStuff.h"
#include "vcfUi.h"
#include "bbiFile.h"
#include "ensFace.h"
#include "microarray.h"
+#include "trackVersion.h"
#define MAIN_FORM "mainForm"
#define WIGGLE_HELP_PAGE "../goldenPath/help/hgWiggleTrackHelp.html"
struct cart *cart = NULL; /* Cookie cart with UI settings */
char *database = NULL; /* Current database. */
char *chromosome = NULL; /* Chromosome. */
struct hash *trackHash = NULL; /* Hash of all tracks in database. */
void tfbsConsSitesUi(struct trackDb *tdb)
{
float tfbsConsSitesCutoff =
sqlFloat(cartUsualString(cart,TFBS_SITES_CUTOFF,TFBS_SITES_CUTOFF_DEFAULT));
printf("
Z score cutoff (default %s, minimum %s): ",
@@ -2923,31 +2924,32 @@
cartSaveSession(cart);
cgiMakeHiddenVar(CT_SELECTED_TABLE_VAR, tdb->track);
puts("\n");
if (ct->bbiFile)
{
time_t timep = bbiUpdateTime(ct->bbiFile);
printBbiUpdateTime(&timep);
}
else
printUpdateTime(CUSTOM_TRASH, ct->tdb, ct);
}
if (!ct)
{
/* Print data version trackDB setting, if any */
- char *version = trackDbSetting(tdb, "dataVersion");
+ struct trackVersion *trackVersion = getTrackVersion(database, tdb->track);
+ char *version = trackVersion == NULL ? trackDbSetting(tdb, "dataVersion") : trackVersion->version;
if (version)
{
cgiDown(0.7);
printf("Data version: %s\n", version);
}
/* Print lift information from trackDb, if any */
trackDbPrintOrigAssembly(tdb, database);
printUpdateTime(database, tdb, NULL);
}
if (tdb->html != NULL && tdb->html[0] != 0)
{
char *browserVersion;