src/hg/hgTables/wiggle.c 1.78
1.78 2010/05/11 01:43:25 kent
Refactoring to split the trackDb.tableName field into separate track and table fields. Similarly track.mapName field goes to the same track and table fields.
Index: src/hg/hgTables/wiggle.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTables/wiggle.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -b -B -U 4 -r1.77 -r1.78
--- src/hg/hgTables/wiggle.c 22 Apr 2010 19:25:22 -0000 1.77
+++ src/hg/hgTables/wiggle.c 11 May 2010 01:43:25 -0000 1.78
@@ -403,13 +403,13 @@
struct slRef *tdbRef;
for (tdbRef = tdbRefList; tdbRef != NULL; tdbRef = tdbRef->next)
{
struct trackDb *sTdb = tdbRef->val;
- if (isSubtrackMerged(sTdb->tableName) &&
- ! sameString(tdb1->tableName, sTdb->tableName) &&
+ if (isSubtrackMerged(sTdb->table) &&
+ ! sameString(tdb1->table, sTdb->table) &&
hSameTrackDbType(tdb1->type, sTdb->type))
{
- struct trackTable *tt2 = trackTableNew(sTdb, sTdb->tableName, conn);
+ struct trackTable *tt2 = trackTableNew(sTdb, sTdb->table, conn);
struct dataVector *dataVector2 = dataVectorFetchOneRegion(tt2, region,
conn);
numSubtracks++;
if (dataVector2 == NULL)
@@ -645,16 +645,16 @@
textOpen();
if (track != NULL)
{
- if (!sameString(track->tableName, table) && track->subtracks != NULL)
+ if (!sameString(track->table, table) && track->subtracks != NULL)
{
struct slRef *tdbRefList = trackDbListGetRefsToDescendantLeaves(track->subtracks);
struct slRef *tdbRef;
for (tdbRef = tdbRefList; tdbRef != NULL; tdbRef = tdbRef->next)
{
struct trackDb *tdb = tdbRef->val;
- if (sameString(tdb->tableName, table))
+ if (sameString(tdb->table, table))
{
track = tdb;
break;
}