src/hg/hgTables/hgTables.c 1.196

1.196 2010/05/14 23:32:00 kent
Refactoring a bit so can pass a table string rather than a track struct to eliminate a track/table potential blending of things.

Index: src/hg/hgTables/hgTables.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTables/hgTables.c,v
retrieving revision 1.195
retrieving revision 1.196
diff -b -B -U 4 -r1.195 -r1.196
--- src/hg/hgTables/hgTables.c	11 May 2010 23:46:27 -0000	1.195
+++ src/hg/hgTables/hgTables.c	14 May 2010 23:32:00 -0000	1.196
@@ -721,8 +721,14 @@
     {
     if (sameString(name, track->track) &&
        (group == NULL || sameString(group->name, track->grp)))
        return track;
+    if (track->subtracks)
+        {
+	struct trackDb *subtrack = findTrackInGroup(name, track->subtracks, group);
+	if (subtrack != NULL)
+	    return subtrack;
+	}
     }
 return NULL;
 }
 
@@ -1261,10 +1267,9 @@
 if (hIsBigBed(database, table, curTrack, ctLookupName))
     bigBedTabOut(db, table, conn, fields, f);
 else if (isCustomTrack(table))
     {
-    struct trackDb *track = findTrack(table, fullTrackList);
-    doTabOutCustomTracks(db, track, conn, fields, f);
+    doTabOutCustomTracks(db, table, conn, fields, f);
     }
 else
     doTabOutDb(db, db, table, table, f, conn, fields);
 }