src/hg/hgTracks/retroGene.c 1.19

Index: src/hg/hgTracks/retroGene.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/retroGene.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -b -B -U 4 -r1.18 -r1.19
--- src/hg/hgTracks/retroGene.c	21 Dec 2009 22:43:34 -0000	1.18
+++ src/hg/hgTracks/retroGene.c	11 May 2010 01:43:28 -0000	1.19
@@ -55,9 +55,9 @@
 char **row;
 int rowOffset;
 int colCount ;
 
-sr = hRangeQuery(conn, tg->mapName, chromName, winStart, winEnd, NULL, &rowOffset);
+sr = hRangeQuery(conn, tg->table, chromName, winStart, winEnd, NULL, &rowOffset);
 colCount = sqlCountColumns(sr);
 while ((row = sqlNextRow(sr)) != NULL)
     {
     if (colCount == 56)
@@ -123,11 +123,11 @@
 /* Get name to use for retroGene item. */
 {
 struct linkedFeatures *lf = item;
 char cartvar[512];
-boolean isNative = sameString(tg->mapName, "pseudoGeneLink") ;
-boolean isRetroNative = startsWith( "ucscRetro", tg->mapName) || startsWith( "retroMrnaInfo", tg->mapName);
-safef(cartvar, sizeof(cartvar), "%s.label", (isNative ? "pseudoGeneLink.label" : (isRetroNative ? tg->mapName : "xenoRefGene.label")));
+boolean isNative = sameString(tg->table, "pseudoGeneLink") ;
+boolean isRetroNative = startsWith( "ucscRetro", tg->table) || startsWith( "retroMrnaInfo", tg->table);
+safef(cartvar, sizeof(cartvar), "%s.label", (isNative ? "pseudoGeneLink.label" : (isRetroNative ? tg->track : "xenoRefGene.label")));
 char *refGeneLabel = cartUsualString(cart, cartvar, "gene") ;
 boolean useGeneName = sameString(refGeneLabel, "gene")
     || sameString(refGeneLabel, "both");
 boolean useAcc = sameString(refGeneLabel, "accession")
@@ -170,19 +170,19 @@
 unsigned labelSet = 0;
 
 // label setting are on parent track
 char prefix[128];
-safef(prefix, sizeof(prefix), "%s.label", tg->tdb->tableName);
+safef(prefix, sizeof(prefix), "%s.label", tg->tdb->track);
 struct hashEl *labels = cartFindPrefix(cart, prefix);
 
 if (labels == NULL)
     {
     // default to common name+accession and save this in cart so it makes sense in trackUi
     labelSet = useAcc;
     char setting[64];
-    safef(setting, sizeof(setting), "%s.label.acc", tg->tdb->tableName);
+    safef(setting, sizeof(setting), "%s.label.acc", tg->tdb->track);
     cartSetBoolean(cart, setting, TRUE);
-    safef(setting, sizeof(setting), "%s.label.orgCommon", tg->tdb->tableName);
+    safef(setting, sizeof(setting), "%s.label.orgCommon", tg->tdb->track);
     cartSetBoolean(cart, setting, TRUE);
     }
 struct hashEl *label;
 for (label = labels; label != NULL; label = label->next)