436742e05bb3a4b767d3e8264df230c72cffd925 hiram Wed Jan 5 12:30:49 2011 -0800 incorrect initialization of dateReference string in ensembl links diff --git src/hg/hgc/hgc.c src/hg/hgc/hgc.c index f27a211..c88887b 100644 --- src/hg/hgc/hgc.c +++ src/hg/hgc/hgc.c @@ -8314,55 +8314,52 @@ void doEnsemblGene(struct trackDb *tdb, char *item, char *itemForUrl) /* Put up Ensembl Gene track info or Ensembl NonCoding track info. */ { char *dupe, *type, *words[16]; int wordCount; int start = cartInt(cart, "o"); struct sqlConnection *conn = hAllocConn(database); char condStr[256]; char versionString[256]; char dateReference[256]; char headerTitle[512]; /* see if hgFixed.trackVersion exists */ boolean trackVersionExists = hTableExists("hgFixed", "trackVersion"); +/* assume nothing found */ +versionString[0] = 0; +dateReference[0] = 0; if (trackVersionExists) { char query[256]; safef(query, sizeof(query), "select version,dateReference from hgFixed.trackVersion where db = '%s' AND name = 'ensGene' order by updateTime DESC limit 1", database); struct sqlResult *sr = sqlGetResult(conn, query); char **row; /* in case of NULL result from the table */ versionString[0] = 0; while ((row = sqlNextRow(sr)) != NULL) { safef(versionString, sizeof(versionString), "Ensembl %s", row[0]); safef(dateReference, sizeof(dateReference), "%s", row[1]); } sqlFreeResult(&sr); } -else - { - versionString[0] = 0; - dateReference[0] = 0; - } - if (itemForUrl == NULL) itemForUrl = item; dupe = cloneString(tdb->type); if (versionString[0]) safef(headerTitle, sizeof(headerTitle), "%s - %s", item, versionString); else safef(headerTitle, sizeof(headerTitle), "%s", item); genericHeader(tdb, headerTitle); wordCount = chopLine(dupe, words); char *archive = trackDbSetting(tdb, "ensArchive"); if (archive == NULL) { if (dateReference[0]) @@ -10950,56 +10947,54 @@ } geneShowCommon(name, tdb, "vegaPep"); printTrackHtml(tdb); } void doVegaGene(struct trackDb *tdb, char *item, char *itemForUrl) /* Handle click on Vega gene track. */ { struct vegaInfo *vi = NULL; char versionString[256]; char dateReference[256]; char headerTitle[512]; /* see if hgFixed.trackVersion exists */ boolean trackVersionExists = hTableExists("hgFixed", "trackVersion"); +/* assume nothing found */ +versionString[0] = 0; +dateReference[0] = 0; if (trackVersionExists) { char query[256]; struct sqlConnection *conn = hAllocConn(database); safef(query, sizeof(query), "select version,dateReference from hgFixed.trackVersion where db = '%s' AND name = 'vegaGene' order by updateTime DESC limit 1", database); struct sqlResult *sr = sqlGetResult(conn, query); char **row; /* in case of NULL result from the table */ versionString[0] = 0; while ((row = sqlNextRow(sr)) != NULL) { safef(versionString, sizeof(versionString), "Vega %s", row[0]); safef(dateReference, sizeof(dateReference), "%s", row[1]); } sqlFreeResult(&sr); hFreeConn(&conn); } -else - { - versionString[0] = 0; - dateReference[0] = 0; - } if (itemForUrl == NULL) itemForUrl = item; if (versionString[0]) safef(headerTitle, sizeof(headerTitle), "%s - %s", item, versionString); else safef(headerTitle, sizeof(headerTitle), "%s", item); genericHeader(tdb, headerTitle); if (hTableExists(database, "vegaInfo")) { char query[256]; struct sqlConnection *conn = hAllocConn(database);