584d0d429e9fa7beb1213e9ece961b3a58d5d413 max Thu Oct 8 08:07:26 2020 -0700 making refseq default to showing accessions. refs #26089 diff --git src/hg/hgTracks/simpleTracks.c src/hg/hgTracks/simpleTracks.c index 6082a4a..440b04c 100644 --- src/hg/hgTracks/simpleTracks.c +++ src/hg/hgTracks/simpleTracks.c @@ -7205,31 +7205,31 @@ struct linkedFeatures *lf = item; char buffer[1024]; safecpy(buffer, sizeof buffer, lf->name); chopSuffix(buffer); return cloneString(buffer); } void lookupRefNames(struct track *tg) /* This converts the refSeq accession to a gene name where possible. */ { struct linkedFeatures *lf; struct sqlConnection *conn = hAllocConn(database); boolean isNative = !sameString(tg->table, "xenoRefGene"); boolean labelStarted = FALSE; boolean useGeneName = FALSE; -boolean useAcc = FALSE; +boolean useAcc = TRUE; boolean useMim = FALSE; char trackLabel[1024]; char *labelString = tg->table; boolean isRefGene = TRUE; if (startsWith("ncbiRefSeq", labelString)) { labelString="refSeqComposite"; isRefGene = FALSE; } else if (tdbIsCompositeChild(tg->tdb) && sameWord("refGene", labelString)) { labelString="refSeqComposite"; // manage the case of existing refGene isRefGene = TRUE; // track in composite without new tables } @@ -7237,32 +7237,32 @@ safef(trackLabel, sizeof trackLabel, "%s.label", labelString); struct hashEl *refGeneLabels = cartFindPrefix(cart, trackLabel); struct hashEl *label; char omimLabel[48]; safef(omimLabel, sizeof(omimLabel), "omim%s", cartString(cart, "db")); if (refGeneLabels == NULL) { useGeneName = TRUE; /* default to gene name */ } for (label = refGeneLabels; label != NULL; label = label->next) { if (endsWith(label->name, "gene") && differentString(label->val, "0")) useGeneName = TRUE; - else if (endsWith(label->name, "acc") && differentString(label->val, "0")) - useAcc = TRUE; + else if (endsWith(label->name, "acc") && sameString(label->val, "0")) + useAcc = FALSE; else if (endsWith(label->name, omimLabel) && differentString(label->val, "0")) useMim = TRUE; else if (!endsWith(label->name, "gene") && !endsWith(label->name, "acc") && !endsWith(label->name, omimLabel) ) { useGeneName = TRUE; } } if (useGeneName) { /* set cart to match the default set */ char setting[64]; safef(setting, sizeof(setting), "%s.label.gene", labelString); cartSetBoolean(cart, setting, TRUE);