src/hg/hgTracks/bedTrack.c 1.24

Index: src/hg/hgTracks/bedTrack.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/bedTrack.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -b -B -U 4 -r1.23 -r1.24
--- src/hg/hgTracks/bedTrack.c	14 Jan 2010 22:36:30 -0000	1.23
+++ src/hg/hgTracks/bedTrack.c	25 Mar 2010 17:46:01 -0000	1.24
@@ -86,10 +86,9 @@
     char *scoreFilter = cartOrTdbString(cart, tg->tdb, "scoreFilter", NULL);
     if (scoreFilter != NULL || tg->visibility != tvDense)
 	{
 	struct lm *lm = lmInit(0);
-	struct bigBedInterval *bb, *bbList = bigBedSelectRange(conn, tg,
-							       chromName, winStart, winEnd, lm);
+	struct bigBedInterval *bb, *bbList = bigBedSelectRange(tg, chromName, winStart, winEnd, lm);
 	char *bedRow[32];
 	char startBuf[16], endBuf[16];
 	int minScore = 0;
 	if (scoreFilter)
@@ -185,21 +184,21 @@
 
 void loadBed9(struct track *tg)
 /* Convert bed 9 info in window to linked feature.  (to handle itemRgb)*/
 {
-struct sqlConnection *conn = hAllocConn(database);
+struct trackDb *tdb = tg->tdb;
+struct sqlConnection *conn = hAllocConnTrack(database, tdb);
 struct bed *bed;
 struct linkedFeatures *lfList = NULL, *lf;
-struct trackDb *tdb = tg->tdb;
 int scoreMin = atoi(trackDbSettingClosestToHomeOrDefault(tdb, "scoreMin", "0"));
 int scoreMax = atoi(trackDbSettingClosestToHomeOrDefault(tdb, "scoreMax", "1000"));
 boolean useItemRgb = FALSE;
 
 useItemRgb = bedItemRgb(tdb);
 
 if (tg->isBigBed)
     {
-    bigBedAddLinkedFeaturesFrom(conn, tg, chromName, winStart, winEnd,
+    bigBedAddLinkedFeaturesFrom(tg, chromName, winStart, winEnd,
           scoreMin, scoreMax, useItemRgb, 9, &lfList);
     }
 else
     {
@@ -247,9 +246,9 @@
 useItemRgb = bedItemRgb(tdb);
 
 if (tg->isBigBed)
     {
-    bigBedAddLinkedFeaturesFrom(conn, tg, chromName, winStart, winEnd,
+    bigBedAddLinkedFeaturesFrom(tg, chromName, winStart, winEnd,
           scoreMin, scoreMax, useItemRgb, 8, &lfList);
     }
 else
     {
@@ -448,9 +447,9 @@
 useItemRgb = bedItemRgb(tdb);
 
 if (tg->isBigBed)
     {
-    bigBedAddLinkedFeaturesFrom(conn, tg, chromName, winStart, winEnd,
+    bigBedAddLinkedFeaturesFrom(tg, chromName, winStart, winEnd,
           scoreMin, scoreMax, useItemRgb, 12, &lfList);
     }
 else
     {