src/hg/hgTracks/rmskTrack.c 1.14
1.14 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/hgTracks/rmskTrack.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/rmskTrack.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -b -B -U 4 -r1.13 -r1.14
--- src/hg/hgTracks/rmskTrack.c 9 Dec 2009 19:53:34 -0000 1.13
+++ src/hg/hgTracks/rmskTrack.c 11 May 2010 01:43:28 -0000 1.14
@@ -91,9 +91,9 @@
ri->yOffset = y;
y += lineHeight;
hashAdd(hash, ri->class, ri);
}
- sr = hRangeQuery(conn, tg->mapName, chromName, winStart, winEnd, NULL,
+ sr = hRangeQuery(conn, tg->table, chromName, winStart, winEnd, NULL,
&rowOffset);
while ((row = sqlNextRow(sr)) != NULL)
{
rmskOutStaticLoad(row+rowOffset, &ro);
@@ -123,9 +123,9 @@
{
sprintf(statusLine, "Repeat %s, family %s",
ro.repName, ro.repFamily);
}
- mapBoxHc(hvg, ro.genoStart, ro.genoEnd, x1, ri->yOffset, w, heightPer, tg->mapName,
+ mapBoxHc(hvg, ro.genoStart, ro.genoEnd, x1, ri->yOffset, w, heightPer, tg->track,
ro.repName, statusLine);
}
}
freeHash(&hash);
@@ -135,9 +135,9 @@
char table[64];
boolean hasBin;
struct dyString *query = newDyString(1024);
/* Do black and white on single track. Fetch less than we need from database. */
- if (hFindSplitTable(database, chromName, tg->mapName, table, &hasBin))
+ if (hFindSplitTable(database, chromName, tg->table, table, &hasBin))
{
dyStringPrintf(query, "select genoStart,genoEnd from %s where ", table);
if (hasBin)
hAddBinToQuery(winStart, winEnd, query);