src/hg/hgTracks/chainTrack.c 1.31

Index: src/hg/hgTracks/chainTrack.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/chainTrack.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -b -B -U 4 -r1.30 -r1.31
--- src/hg/hgTracks/chainTrack.c	3 Sep 2008 19:19:01 -0000	1.30
+++ src/hg/hgTracks/chainTrack.c	12 Mar 2009 00:05:48 -0000	1.31
@@ -376,20 +376,17 @@
 {
 
 boolean normScoreAvailable = FALSE;
 struct cartOptions *chainCart;
-char scoreOption[256];
 
 AllocVar(chainCart);
 
 normScoreAvailable = chainDbNormScoreAvailable(database, chromName, tg->mapName, NULL);
 
 /*	what does the cart say about coloring option	*/
-chainCart->chainColor = chainFetchColorOption(tdb, (char **) NULL);
-
-snprintf( scoreOption, sizeof(scoreOption), "%s.scoreFilter", tdb->tableName);
-chainCart->scoreFilter = cartUsualInt(cart, scoreOption, 0);
-
+chainCart->chainColor = chainFetchColorOption(cart, tdb, (char **) NULL);
+chainCart->scoreFilter = cartUsualIntClosestToHome(cart, tdb,
+	FALSE, SCORE_FILTER, 0);
 
 linkedFeaturesMethods(tg);
 tg->itemColor = lfChromColor;	/*	default coloring option */
 
@@ -411,13 +408,11 @@
 	}
     }
 else
     {
-    char option[128]; /* Option -  rainbow chromosome color */
     char *optionStr;	/* this old option was broken before */
 
-    snprintf(option, sizeof(option), "%s.color", tg->mapName);
-    optionStr = cartUsualString(cart, option, "on");
+    optionStr = cartUsualStringClosestToHome(cart, tdb, FALSE, "color", "on");
     if (differentWord("on",optionStr))
 	{
 	setNoColor(tg);
 	chainCart->chainColor = chainColorNoColors;