src/hg/hgTables/compositeTrack.c 1.19
1.19 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/compositeTrack.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTables/compositeTrack.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -b -B -U 4 -r1.18 -r1.19
--- src/hg/hgTables/compositeTrack.c 4 Jan 2010 19:12:21 -0000 1.18
+++ src/hg/hgTables/compositeTrack.c 11 May 2010 01:43:25 -0000 1.19
@@ -155,9 +155,9 @@
{
char *dbTable = getDbTable(database, curTable);
htmlOpen("Merge subtracks of %s (%s)",
- curTrack->tableName, curTrack->longLabel);
+ curTrack->table, curTrack->longLabel);
hPrintf("<FORM ACTION=\"../cgi-bin/hgTables\" NAME=\"mainForm\" METHOD=%s>\n",
cartUsualString(cart, "formMethod", "POST"));
cartSaveSession(cart);
@@ -245,14 +245,14 @@
struct slRef *tdbRef, *tdbRefList = trackDbListGetRefsToDescendantLeaves(curTrack->subtracks);
for (tdbRef = tdbRefList; tdbRef != NULL; tdbRef = tdbRef->next)
{
tdb = tdbRef->val;
- if (!sameString(tdb->tableName, curTable) &&
- isSubtrackMerged(tdb->tableName) &&
+ if (!sameString(tdb->table, curTable) &&
+ isSubtrackMerged(tdb->table) &&
sameString(tdb->type, primary->type))
{
dyStringAppend(dy, linePrefix);
- dyStringPrintf(dy, " %s (%s)\n", tdb->tableName, tdb->longLabel);
+ dyStringPrintf(dy, " %s (%s)\n", tdb->table, tdb->longLabel);
}
}
return dyStringCannibalize(&dy);
}