src/hg/hgTracks/rnaFoldTrack.c 1.9
1.9 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/rnaFoldTrack.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/rnaFoldTrack.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -b -B -U 4 -r1.8 -r1.9
--- src/hg/hgTracks/rnaFoldTrack.c 3 Mar 2009 21:11:25 -0000 1.8
+++ src/hg/hgTracks/rnaFoldTrack.c 11 May 2010 01:43:28 -0000 1.9
@@ -19,9 +19,9 @@
char **row = NULL;
struct slList *itemList = NULL, *item = NULL;
if (NULL == sr)
- errAbort("While loading track %s, bedLoadItemSqlResult was given empty sqlResult", tg->mapName);
+ errAbort("While loading track %s, bedLoadItemSqlResult was given empty sqlResult", tg->track);
while ((row = sqlNextRow(sr)) != NULL)
{
item = loader(row + rowOffset);
@@ -38,9 +38,9 @@
char option[128]; /* Option - score filter */
char *optionScoreVal;
int optionScore = defaultFilterScore;
-safef(option, sizeof(option), "%s.scoreFilter", tg->mapName);
+safef(option, sizeof(option), "%s.scoreFilter", tg->track);
optionScoreVal = trackDbSetting(tg->tdb, "scoreFilter");
if (optionScoreVal != NULL)
optionScore = atoi(optionScoreVal);
optionScore = cartUsualInt(cart, option, optionScore);
@@ -57,9 +57,9 @@
struct sqlResult *sr = NULL;
char extraWhere[128];
scoreFilterSqlClause(tg, extraWhere, sizeof(extraWhere), 0);
-sr = hRangeQuery(conn, tg->mapName, chromName, winStart, winEnd, extraWhere, &rowOffset);
+sr = hRangeQuery(conn, tg->table, chromName, winStart, winEnd, extraWhere, &rowOffset);
bedLoadItemBySqlResult(tg, sr, rowOffset, (ItemLoader)rnaSecStrLoad);
sqlFreeResult(&sr);
hFreeConn(&conn);
@@ -212,9 +212,9 @@
Color textColor = hvGfxContrastingColor(hvg, color);
hvGfxTextCentered(hvg, x1, y, w, heightPer, textColor, font, s);
}
mapBoxHc(hvg, rnaSecStr->chromStart, rnaSecStr->chromEnd, x1, y, x2 - x1, heightPer,
- tg->mapName, tg->mapItemName(tg, rnaSecStr), NULL);
+ tg->track, tg->mapItemName(tg, rnaSecStr), NULL);
}
}
}