7c1b70f1f022345512d7a5d76286920f3cc5d5fd hiram Fri Feb 12 10:34:08 2016 -0800 manage the case of existing refGene track in new composite without the new tables refs #13673 diff --git src/hg/hgTracks/simpleTracks.c src/hg/hgTracks/simpleTracks.c index c2366dc..a7308b4 100644 --- src/hg/hgTracks/simpleTracks.c +++ src/hg/hgTracks/simpleTracks.c @@ -6840,36 +6840,41 @@ 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 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 + } + 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;