src/hg/hgc/wiggleClick.c 1.34
1.34 2010/05/11 01:43:29 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/wiggleClick.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgc/wiggleClick.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -b -B -U 4 -r1.33 -r1.34
--- src/hg/hgc/wiggleClick.c 4 Jan 2010 19:12:27 -0000 1.33
+++ src/hg/hgc/wiggleClick.c 11 May 2010 01:43:29 -0000 1.34
@@ -30,14 +30,14 @@
struct customTrack *ct = NULL;
boolean isCustom = FALSE;
int operations = wigFetchStats; /* default operation */
-if (startsWith("ct_", tdb->tableName))
+if (startsWith("ct_", tdb->table))
{
- ct = lookupCt(tdb->tableName);
+ ct = lookupCt(tdb->table);
if (!ct)
{
- warn("<P>wiggleClick: can not find custom wiggle track '%s'</P>", tdb->tableName);
+ warn("<P>wiggleClick: can not find custom wiggle track '%s'</P>", tdb->table);
return;
}
if (! ct->wiggle)
{
@@ -57,9 +57,9 @@
isCustom = TRUE;
}
else
{
- hFindSplitTable(database, seqName, tdb->tableName, table, &hasBin);
+ hFindSplitTable(database, seqName, tdb->table, table, &hasBin);
/*span = spanInUse(conn, table, chrom, winStart, winEnd, cart);*/
span = minSpan(conn, table, chrom, winStart, winEnd, cart, tdb);
}
@@ -226,9 +226,9 @@
printf("<B>Total Bases in view: </B> %s <BR>\n", num1Buf);
if (bbList != NULL)
{
- bbiIntervalStatsReport(bbList, tdb->tableName, chrom, winStart, winEnd);
+ bbiIntervalStatsReport(bbList, tdb->table, chrom, winStart, winEnd);
}
else
{
printf("<P>No data overlapping current position.</P>");
@@ -243,12 +243,12 @@
char *item, int start)
/* Display details for BigWig built in tracks. */
{
char query[256];
-safef(query, sizeof(query), "select fileName from %s", tdb->tableName);
+safef(query, sizeof(query), "select fileName from %s", tdb->table);
char *fileName = sqlQuickString(conn, query);
if (fileName == NULL)
- errAbort("Missing fileName in %s table", tdb->tableName);
+ errAbort("Missing fileName in %s table", tdb->table);
bigWigClick(tdb, fileName);
}
void bigWigCustomClick(struct trackDb *tdb)