src/hg/hgTracks/bamTrack.c 1.29

1.29 2010/03/04 05:14:13 angie
Pass sql conn into bamFileNameFromTable, so we can get it from hAllocConnTrack, to support use of hg.conf profiles.

Index: src/hg/hgTracks/bamTrack.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/bamTrack.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -b -B -U 4 -r1.28 -r1.29
--- src/hg/hgTracks/bamTrack.c	3 Mar 2010 19:30:04 -0000	1.28
+++ src/hg/hgTracks/bamTrack.c	4 Mar 2010 05:14:13 -0000	1.29
@@ -433,9 +433,13 @@
     if (fileName == NULL)
 	errAbort("bamLoadItemsCore: can't find bigDataUrl for custom track %s", tg->mapName);
     }
 else
-    fileName = bamFileNameFromTable(database, tg->mapName, chromName);
+    {
+    struct sqlConnection *conn = hAllocConnTrack(database, tg->tdb);
+    fileName = bamFileNameFromTable(conn, tg->mapName, chromName);
+    hFreeConn(&conn);
+    }
 
 char posForBam[512];
 safef(posForBam, sizeof(posForBam), "%s:%d-%d", chromName, winStart, winEnd);
 if (!isPaired)