src/hg/hgTables/hgTables.c 1.197
1.197 2010/05/19 00:52:24 kent
Fixing crash on regulation group from container track.
Index: src/hg/hgTables/hgTables.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTables/hgTables.c,v
retrieving revision 1.196
retrieving revision 1.197
diff -b -B -U 4 -r1.196 -r1.197
--- src/hg/hgTables/hgTables.c 14 May 2010 23:32:00 -0000 1.196
+++ src/hg/hgTables/hgTables.c 19 May 2010 00:52:24 -0000 1.197
@@ -903,9 +903,9 @@
slAddHead(pList, name);
hashAdd(uniqHash, wig->table, NULL);
}
}
- if (tdbIsComposite(track))
+ if (track->subtracks)
{
struct slName *subList = NULL;
struct slRef *tdbRefList = trackDbListGetRefsToDescendantLeaves(track->subtracks);
slSort(&tdbRefList, trackDbRefCmp);
@@ -955,12 +955,14 @@
}
}
slNameSort(&nameList);
}
-name = slNameNew(trackTable);
-if (!tdbIsComposite(track))
- /* suppress for composite tracks -- only the subtracks have tables */
+/* suppress for parent tracks -- only the subtracks have tables */
+if (track->subtracks == NULL)
+ {
+ name = slNameNew(trackTable);
slAddHead(&nameList, name);
+ }
addTablesAccordingToTrackType(&nameList, uniqHash, track);
hashFree(&uniqHash);
return nameList;
}