src/hg/hgc/expClick.c 1.25

1.25 2010/05/11 01:43:28 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/hgc/expClick.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgc/expClick.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -b -B -U 4 -r1.24 -r1.25
--- src/hg/hgc/expClick.c	22 Jan 2010 22:52:04 -0000	1.24
+++ src/hg/hgc/expClick.c	11 May 2010 01:43:28 -0000	1.25
@@ -424,9 +424,9 @@
 char *tdbSetting = trackDbSettingOrDefault(tdb, "expColor", "redGreen");
 char *colorVal = NULL;
 enum expColorType colorScheme;
 char colorVarName[256];
-safef(colorVarName, sizeof(colorVarName), "%s.color", tdb->tableName);
+safef(colorVarName, sizeof(colorVarName), "%s.color", tdb->track);
 colorVal = cartUsualString(cart, colorVarName, tdbSetting);
 colorScheme = getExpColorType(colorVal);
 
 if (sameWord(tdb->grp, "cancerGenomics"))
@@ -437,9 +437,9 @@
 
 if (!ct)
     {
     genericHeader(tdb, itemName);
-    bedList = loadMsBed(tdb, tdb->tableName, seqName, winStart, winEnd);
+    bedList = loadMsBed(tdb, tdb->table, seqName, winStart, winEnd);
     }
 else if (ct->dbTrack)
     {
     genericHeader(tdb, itemName);
@@ -460,9 +460,9 @@
     int i;
     if (!ct)
 	{
 	groupings = maGetTrackGroupings(database, tdb);
-	combineGroup = maCombineGroupingFromCart(groupings, cart, tdb->tableName);
+	combineGroup = maCombineGroupingFromCart(groupings, cart, tdb->track);
 	}
     else
 	combineGroup = maGetGroupingFromCt(ct);
     maBedClumpGivenGrouping(bedList, combineGroup);