src/hg/hgc/bamClick.c 1.21
1.21 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/bamClick.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgc/bamClick.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -b -B -U 4 -r1.20 -r1.21
--- src/hg/hgc/bamClick.c 16 Mar 2010 06:58:22 -0000 1.20
+++ src/hg/hgc/bamClick.c 11 May 2010 01:43:28 -0000 1.21
@@ -173,26 +173,26 @@
udcSetCacheTimeout(300);
#endif//def USE_BAM && KNETFILE_HOOKS
char varName[1024];
-safef(varName, sizeof(varName), "%s_pairEndsByName", tdb->tableName);
+safef(varName, sizeof(varName), "%s_pairEndsByName", tdb->track);
boolean isPaired = cartUsualBoolean(cart, varName,
(trackDbSetting(tdb, "pairEndsByName") != NULL));
char position[512];
safef(position, sizeof(position), "%s:%d-%d", seqName, winStart, winEnd);
struct hash *pairHash = isPaired ? hashNew(0) : NULL;
struct bamTrackData btd = {start, item, pairHash};
char *fileName;
-if (isCustomTrack(tdb->tableName))
+if (isCustomTrack(tdb->table))
{
fileName = trackDbSetting(tdb, "bigDataUrl");
if (fileName == NULL)
- errAbort("doBamDetails: can't find bigDataUrl for custom track %s", tdb->tableName);
+ errAbort("doBamDetails: can't find bigDataUrl for custom track %s", tdb->track);
}
else
{
struct sqlConnection *conn = hAllocConnTrack(database, tdb);
- fileName = bamFileNameFromTable(conn, tdb->tableName, seqName);
+ fileName = bamFileNameFromTable(conn, tdb->table, seqName);
hFreeConn(&conn);
}
bamFetch(fileName, position, oneBam, &btd);
if (isPaired)