src/hg/hgTracks/wikiTrack.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/hgTracks/wikiTrack.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/wikiTrack.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -b -B -U 4 -r1.20 -r1.21
--- src/hg/hgTracks/wikiTrack.c 1 Nov 2009 19:46:05 -0000 1.20
+++ src/hg/hgTracks/wikiTrack.c 11 May 2010 01:43:28 -0000 1.21
@@ -51,15 +51,15 @@
}
if (enableHgcClick)
{
- mapBoxHgcOrHgGene(hvg, start, end, x, y, width, height, tg->mapName,
+ mapBoxHgcOrHgGene(hvg, start, end, x, y, width, height, tg->track,
hgcClickName, statusLine, NULL, FALSE, NULL );
}
else
{ /* go directly to the wiki description */
char *directUrl = wikiUrl(wikiItem);
- mapBoxHgcOrHgGene(hvg, start, end, x, y, width, height, tg->mapName,
+ mapBoxHgcOrHgGene(hvg, start, end, x, y, width, height, tg->track,
hgcClickName, statusLine, directUrl, FALSE, NULL);
freeMem(directUrl);
}
}
@@ -117,9 +117,9 @@
int scoreMax = 99999;
safef(where, ArraySize(where), "db='%s'", database);
-sr = hRangeQuery(wikiConn, tg->mapName, chromName, winStart, winEnd, where, &rowOffset);
+sr = hRangeQuery(wikiConn, tg->table, chromName, winStart, winEnd, where, &rowOffset);
while ((row = sqlNextRow(sr)) != NULL)
{
struct wikiTrack *item = wikiTrackLoad(row);
AllocVar(bed);
@@ -172,9 +172,9 @@
tg->items = lfList;
} /* static void wikiTrackLoadItems(struct track *tg) */
-struct bed *wikiTrackGetBedRange(char *mapName, char *chromName,
+struct bed *wikiTrackGetBedRange(char *table, char *chromName,
int start, int end)
/* fetch wiki track items as simple bed 3 list in given range */
{
struct bed *bed, *bedList = NULL;
@@ -185,9 +185,9 @@
int rowOffset;
safef(where, ArraySize(where), "db='%s'", database);
-sr = hRangeQuery(wikiConn, mapName, chromName, start, end, where, &rowOffset);
+sr = hRangeQuery(wikiConn, table, chromName, start, end, where, &rowOffset);
while ((row = sqlNextRow(sr)) != NULL)
{
struct wikiTrack *item = wikiTrackLoad(row);
AllocVar(bed);
@@ -215,9 +215,10 @@
errAbort("loadWikiTrack configuration error, set wikiTrack.URL in hg.conf");
linkedFeaturesMethods(tg);
AllocVar(tdb);
- tg->mapName = WIKI_TRACK_TABLE;
+ tg->track = WIKI_TRACK_TABLE;
+ tg->table = WIKI_TRACK_TABLE;
tg->canPack = TRUE;
tg->visibility = tvHide;
tg->hasUi = TRUE;
tg->shortLabel = cloneString(WIKI_TRACK_LABEL);
@@ -232,9 +233,10 @@
tg->groupName = cloneString("map");
tg->defaultGroupName = cloneString("map");
tg->exonArrows = TRUE;
tg->nextItemButtonable = TRUE;
- tdb->tableName = cloneString(tg->mapName);
+ tdb->track = cloneString(tg->track);
+ tdb->table = cloneString(tg->table);
tdb->shortLabel = cloneString(tg->shortLabel);
tdb->longLabel = cloneString(tg->longLabel);
tdb->useScore = 1;
tdb->grp = cloneString(tg->groupName);