51ba155568c8d1eec5d5cbbfd3c4951f1f310d37 hiram Thu Apr 3 23:19:32 2014 -0700 fixup ensGene name display from code review refs #12957 diff --git src/hg/hgTracks/simpleTracks.c src/hg/hgTracks/simpleTracks.c index 01bd7c2..3d41fd6 100644 --- src/hg/hgTracks/simpleTracks.c +++ src/hg/hgTracks/simpleTracks.c @@ -10087,37 +10087,37 @@ static char *ensGeneName(struct track *tg, void *item) { static char cat[128]; struct linkedFeatures *lf = item; if (lf->extra != NULL) { safef(cat, sizeof(cat), "%s", (char *)lf->extra); return cat; } else return lf->name; } static void ensGeneAssignConfiguredName(struct track *tg) -/* Set name on genePred in "extra" field to gene name, accession, or both, +/* Set name on genePred in "extra" field to gene symbol, ENSG id, or ENST id, * depending, on UI on all items in track */ { char *geneLabel = cartUsualStringClosestToHome(cart, tg->tdb, FALSE, "label","accession"); -boolean otherGeneName = sameString(geneLabel, "gene"); -boolean useGeneName = sameString(geneLabel, "ensembl"); -boolean useAcc = sameString(geneLabel, "accession"); +boolean otherGeneName = sameString(geneLabel, "gene symbol"); +boolean useGeneName = sameString(geneLabel, "ENSG* identifier"); +boolean useAcc = sameString(geneLabel, "ENST* identifier"); struct sqlConnection *conn = NULL; if (otherGeneName) conn = hAllocConn(database); struct linkedFeatures *lf; for (lf = tg->items; lf != NULL; lf = lf->next) { struct dyString *name = dyStringNew(SMALLDYBUF); if (otherGeneName) { char buf[256]; char query[256]; sqlSafef(query, sizeof(query), "select value from ensemblToGeneName where name = \"%s\"", lf->name); char *ret = sqlQuickQuery(conn, query, buf, sizeof(buf));